[segyio] 90/376: Trying to move the python code to be py3k compatible

[Jørgen Kvalsvik]

This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to branch debian
in repository segyio.

commit 428e67038e86fd62e8866499aef76bf779dd2b78
Author: Asbjørn Alexander Fellinghaug <asbjorn at fellinghaug.com>
Date:   Mon Oct 31 22:57:20 2016 +0100

    Trying to move the python code to be py3k compatible
---
 python/segyio/_header.py |  6 +++---
 python/segyio/_line.py   |  4 ++--
 python/segyio/_trace.py  |  4 ++--
 python/segyio/segy.py    | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/python/segyio/_header.py b/python/segyio/_header.py
index a773dfd..ffb54ce 100644
--- a/python/segyio/_header.py
+++ b/python/segyio/_header.py
@@ -23,7 +23,7 @@ class Header(object):
             gen_buf = self._header_buffer(buf)
 
             def gen():
-                for i in xrange(*traceno.indices(self.segy.tracecount)):
+                for i in range(*traceno.indices(self.segy.tracecount)):
                     yield self.__getitem__(i, gen_buf)
 
             return gen()
@@ -48,7 +48,7 @@ class Header(object):
         def gen():
             start = t0
             stop = t0 + (length * stride)
-            for i in xrange(start, stop, stride):
+            for i in range(start, stop, stride):
                 yield Field.trace(buf, traceno=i, segy=self.segy)
 
         return gen()
@@ -60,7 +60,7 @@ class Header(object):
         if isinstance(val, Field) or isinstance(val, dict):
             val = itertools.repeat(val)
 
-        for i, x in itertools.izip(xrange(start, stop, stride), val):
+        for i, x in itertools.izip(range(start, stop, stride), val):
             self[i] = x
 
     @property
diff --git a/python/segyio/_line.py b/python/segyio/_line.py
index 341d1f9..8d1cc87 100644
--- a/python/segyio/_line.py
+++ b/python/segyio/_line.py
@@ -46,7 +46,7 @@ class Line:
 
             def gen():
                 s = set(self.lines)
-                rng = xrange(*lineno.indices(self.lines[-1] + 1))
+                rng = range(*lineno.indices(self.lines[-1] + 1))
 
                 # use __getitem__ lookup to avoid tuple
                 # construction and unpacking and fast-forward
@@ -73,7 +73,7 @@ class Line:
             if lineno.start is None:
                 lineno = slice(self.lines[0], lineno.stop, lineno.step)
 
-            rng = xrange(*lineno.indices(self.lines[-1] + 1))
+            rng = range(*lineno.indices(self.lines[-1] + 1))
             s = set(self.lines)
 
             for i, x in itertools.izip(filter(s.__contains__, rng), val):
diff --git a/python/segyio/_trace.py b/python/segyio/_trace.py
index 063fb68..6ab710f 100644
--- a/python/segyio/_trace.py
+++ b/python/segyio/_trace.py
@@ -22,7 +22,7 @@ class Trace:
 
         elif isinstance(index, slice):
             def gen():
-                for i in xrange(*index.indices(len(self))):
+                for i in range(*index.indices(len(self))):
                     yield self._readtr(i, buf)
 
             return gen()
@@ -49,7 +49,7 @@ class Trace:
             self._writetr(index, val)
 
         elif isinstance(index, slice):
-            for i, buf in xrange(*index.indices(len(self))), val:
+            for i, buf in range(*index.indices(len(self))), val:
                 self._writetr(i, val)
 
         else:
diff --git a/python/segyio/segy.py b/python/segyio/segy.py
index 77d4cfc..ced5c17 100644
--- a/python/segyio/segy.py
+++ b/python/segyio/segy.py
@@ -218,7 +218,7 @@ class SegyFile(object):
             val = itertools.repeat(val)
 
         h, buf = self.header, None
-        for i, v in itertools.izip(xrange(self.tracecount), val):
+        for i, v in itertools.izip(range(self.tracecount), val):
             h[i, buf] = v
 
     @property
@@ -262,7 +262,7 @@ class SegyFile(object):
             Reuse an array for memory efficiency when working with indices.
             When using slices or full ranges this is done for you::
                 >>> tr = None
-                >>> for i in xrange(100):
+                >>> for i in range(100):
                 ...     tr = f.trace[i, tr]
                 ...     tr = tr * 2
                 ...     print(np.average(tr))
@@ -308,7 +308,7 @@ class SegyFile(object):
     @trace.setter
     def trace(self, val):
         tr = self.trace
-        for i, v in itertools.izip(xrange(len(tr)), val):
+        for i, v in itertools.izip(range(len(tr)), val):
             tr[i] = v
 
     def _shape_buffer(self, shape, buf):
@@ -402,7 +402,7 @@ class SegyFile(object):
 
         def writefn(t0, length, step, val):
             val = buffn(val)
-            for i, v in itertools.izip(xrange(t0, t0 + step * length, step), val):
+            for i, v in itertools.izip(range(t0, t0 + step * length, step), val):
                 Trace.write_trace(i, v, self)
 
         return Line(self, il_len, il_stride, lines, other_lines, buffn, readfn, writefn, "Inline")
@@ -483,7 +483,7 @@ class SegyFile(object):
 
         def writefn(t0, length, step, val):
             val = buffn(val)
-            for i, v in itertools.izip(xrange(t0, t0 + step * length, step), val):
+            for i, v in itertools.izip(range(t0, t0 + step * length, step), val):
                 Trace.write_trace(i, v, self)
 
         return Line(self, xl_len, xl_stride, lines, other_lines, buffn, readfn, writefn, "Crossline")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git