Merge pull request #1 from vestri/master

Some correction to make pylsd working with Python 3.5
AndranikSargsyan · Feb 9, 2017 · f498c4a · f498c4a
2 parents 7ac78df + aec4a06
commit f498c4a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/example/example_cv2.py b/example/example_cv2.py
@@ -14,7 +14,7 @@
 src = cv2.imread(fullName, cv2.IMREAD_COLOR)
 gray = cv2.cvtColor(src, cv2.COLOR_BGR2GRAY)
 lines = lsd(gray)
-for i in xrange(lines.shape[0]):
+for i in range(lines.shape[0]):
     pt1 = (int(lines[i, 0]), int(lines[i, 1]))
     pt2 = (int(lines[i, 2]), int(lines[i, 3]))
     width = lines[i, 4]

diff --git a/pylsd/__init__.py b/pylsd/__init__.py
@@ -5,4 +5,4 @@
 # @Link    : https://github.com/primetang/pylsd
 # @Version : 0.0.1
 
-from lsd import lsd
+from pylsd import lsd
diff --git a/pylsd/bindings/__init__.py b/pylsd/bindings/__init__.py
@@ -5,4 +5,4 @@
 # @Link    : https://github.com/primetang/pylsd
 # @Version : 0.0.1
 
-from lsd_ctypes import *
+from pylsd.bindings.lsd_ctypes import *
diff --git a/pylsd/bindings/lsd_ctypes.py b/pylsd/bindings/lsd_ctypes.py
@@ -31,7 +31,7 @@ def load_lsd_library():
             try:
                 lsdlib = ctypes.cdll[os.path.join(root_dir, libdir, libname)]
                 return lsdlib
-            except Exception, e:
+            except Exception as e:
                 pass
         tmp = os.path.dirname(root_dir)
         if tmp == root_dir:

diff --git a/pylsd/lsd.py b/pylsd/lsd.py
@@ -5,7 +5,7 @@
 # @Link    : https://github.com/primetang/pylsd
 # @Version : 0.0.1
 
-from bindings.lsd_ctypes import *
+from pylsd.bindings.lsd_ctypes import *
 
 
 def lsd(src):