diff --git a/src/Mod/Arch/Dice3DS/dom3ds.py b/src/Mod/Arch/Dice3DS/dom3ds.py index 900f647a08..1234edc465 100644 --- a/src/Mod/Arch/Dice3DS/dom3ds.py +++ b/src/Mod/Arch/Dice3DS/dom3ds.py @@ -20,8 +20,6 @@ import sys, struct import numpy -# xrange is not available in python3 -xrange = range # Exceptions @@ -393,11 +391,11 @@ class ChunkBase(object): for attr in self.single_order: self.out_chunk(attr,flo,indent,flags) for attr in self.multiple_order: - for i in xrange(len(getattr(self,attr))): + for i in range(len(getattr(self,attr))): self.out_chunk_index(attr,i,flo,indent,flags) if self.freechunks: attr = "subchunks" - for i in xrange(len(self.subchunks)): + for i in range(len(self.subchunks)): self.out_chunk_index(attr,i,flo,indent,flags) # Dump self to stream flo at a certain indentation @@ -635,7 +633,7 @@ class MatrixChunk(ArrayChunk): super(MatrixChunk,self).dump_array(flo,indent,flags) if flags['arraylines'] == 0: return - for i in xrange(4): + for i in range(4): flo.write("%s %12.4g%12.4g%12.4g%12.4g\n" % (indent,self.array[i,0],self.array[i,1], self.array[i,2],self.array[i,3])) @@ -649,7 +647,7 @@ class TrackChunk(ChunkBase): struct = "short flags, long unused1, long unused2, long nkeys" def read_array(self,fbuf,flags): self.keys = [] - for i in xrange(self.nkeys): + for i in range(self.nkeys): kf = self.Key() kf.frameno = self.get_long(fbuf,flags) kf.flags = self.get_short(fbuf,flags) @@ -692,7 +690,7 @@ class TrackChunk(ChunkBase): n = self.nkeys else: n = min(flags['arraylines'],self.nkeys) - for i in xrange(n): + for i in range(n): kf = self.keys[i] flo.write("%skeys[0] = %s.Key\n" % (indent,self.label)) flo.write("%s frameno = %r\n" % (indent,kf.frameno)) @@ -1006,7 +1004,7 @@ class POINT_ARRAY(ArrayChunk): n = self.npoints else: n = min(flags['arraylines'],self.npoints) - for i in xrange(n): + for i in range(n): flo.write("%s %12.4g%12.4g%12.4g\n" % (indent,self.array[i,0],self.array[i,1], self.array[i,2])) @@ -1046,7 +1044,7 @@ class FACE_ARRAY(ArrayChunk): n = self.nfaces else: n = min(flags['arraylines'],self.nfaces) - for i in xrange(n): + for i in range(n): flo.write("%s %10d%10d%10d%10d\n" % (indent,self.array[i,0],self.array[i,1], self.array[i,2],self.array[i,3])) @@ -1070,7 +1068,7 @@ class MSH_MAT_GROUP(ArrayChunk): n = self.mfaces else: n = min(flags['arraylines'],self.mfaces) - for i in xrange(n): + for i in range(n): flo.write("%s %10d\n" % (indent,self.array[i])) if n < self.mfaces: flo.write("%s ...\n" % indent) @@ -1095,7 +1093,7 @@ class TEX_VERTS(ArrayChunk): n = self.npoints else: n = min(flags['arraylines'],self.npoints) - for i in xrange(n): + for i in range(n): flo.write("%s %12.4g%12.4g\n" % (indent,self.array[i,0],self.array[i,1])) if n < self.npoints: @@ -1117,7 +1115,7 @@ class SMOOTH_GROUP(ArrayChunk): n = len(self.array) else: n = min(flags['arraylines'],len(self.array)) - for i in xrange(n): + for i in range(n): flo.write("%s %10d\n" % (indent,self.array[i])) if n < len(self.array): flo.write("%s ...\n" % indent) diff --git a/src/Mod/Arch/Dice3DS/util.py b/src/Mod/Arch/Dice3DS/util.py index 57b5523e1d..b623c73c67 100644 --- a/src/Mod/Arch/Dice3DS/util.py +++ b/src/Mod/Arch/Dice3DS/util.py @@ -8,8 +8,6 @@ Defines some routines for calculating normals and transforming points. import numpy -# xrange is not available in python3 -xrange = range # Can push numpy.float64 (or even numpy.float80) into this if you # would like to use higher precision when calculating; results will be @@ -151,7 +149,7 @@ def calculate_normals_by_cross_product(pointarray,facearray,smarray): rslice = numpy.empty((len(brs)+1,),numpy.int) rslice[:-1] = brs rslice[-1] = 3*m - for i in xrange(len(brs)+1): + for i in range(len(brs)+1): rgroup = lex[lslice[i]:rslice[i]] xgroup = exarray[rgroup] normpat = numpy.logical_or( @@ -256,7 +254,7 @@ def calculate_normals_by_angle_subtended(pointarray,facearray,smarray): rslice = numpy.empty((len(brs)+1,),numpy.int) rslice[:-1] = brs rslice[-1] = 3*m - for i in xrange(len(brs)+1): + for i in range(len(brs)+1): rgroup = lex[lslice[i]:rslice[i]] xgroup = exarray[rgroup] normpat = numpy.logical_or(