[python-dtcwt] 52/497: add fixes for Python 3

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.

commit b5b4e0d90b4026cde5c4965be0214b973e866e9a
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Thu Aug 8 00:08:07 2013 +0100

    add fixes for Python 3
---
 dtcwt/lowlevel.py    | 8 ++++----
 dtcwt/transform1d.py | 2 ++
 dtcwt/transform2d.py | 2 ++
 setup.py             | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dtcwt/lowlevel.py b/dtcwt/lowlevel.py
index f951ff9..f7e8816 100644
--- a/dtcwt/lowlevel.py
+++ b/dtcwt/lowlevel.py
@@ -178,11 +178,11 @@ def coldfilt(X, ha, hb):
     Y = np.zeros((r2,c))
 
     if np.sum(ha*hb) > 0:
-       s1 = np.arange(0, r2, 2)
-       s2 = s1 + 1
+       s1 = slice(0, r2, 2)
+       s2 = slice(1, r2, 2)
     else:
-       s2 = np.arange(0, r2, 2)
-       s1 = s2 + 1
+       s2 = slice(0, r2, 2)
+       s1 = slice(1, r2, 2)
     
     # Perform filtering on columns of extended matrix X(xe,:) in 4 ways. 
     Y[s1,:] = _column_convolve(X[xe[t-1],:],hao) + _column_convolve(X[xe[t-3],:],hae)
diff --git a/dtcwt/transform1d.py b/dtcwt/transform1d.py
index 7e1efa1..71af13a 100644
--- a/dtcwt/transform1d.py
+++ b/dtcwt/transform1d.py
@@ -1,6 +1,8 @@
 import numpy as np
 import logging
 
+from six.moves import xrange
+
 from dtcwt import biort as _biort, qshift as _qshift
 from dtcwt.defaults import DEFAULT_BIORT, DEFAULT_QSHIFT
 from dtcwt.lowlevel import colfilter, coldfilt, colifilt, as_column_vector
diff --git a/dtcwt/transform2d.py b/dtcwt/transform2d.py
index 12d28b1..05fc8c0 100644
--- a/dtcwt/transform2d.py
+++ b/dtcwt/transform2d.py
@@ -1,6 +1,8 @@
 import numpy as np
 import logging
 
+from six.moves import xrange
+
 from dtcwt import biort as _biort, qshift as _qshift
 from dtcwt.defaults import DEFAULT_BIORT, DEFAULT_QSHIFT
 from dtcwt.lowlevel import colfilter, coldfilt, colifilt
diff --git a/setup.py b/setup.py
index c096127..59ad42e 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
 
     setup_requires=[ 'nose>=1.0', ],
 
-    install_requires=[ 'numpy', ],
+    install_requires=[ 'numpy', 'six', ],
 
     extras_require={
         'docs': [ 'sphinx', 'docutils', ],

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