Merge pull request #21 from supriyopaul/python_compatiblity

Python2&3 compatiblity
deep-compute · Mar 20, 2018 · c8bb383 · c8bb383
2 parents c902a76 + d8c1512
commit c8bb383
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ deploy:
     skip_cleanup: true
     api-key:
       secure: Q3wwYSZkwXAG1DwgKZrR/vZTGLZlDBfR9O5MoZ+dpmy6EmFozQLRB+qFh+eWh2Y8xYIdXz+6CaJLcM92JU5zJTslWLHyhO7kTOt31fxuZu+HGnR835Try6TlU11948nn2Ramk4nI3lT/G4jO+PdNq23sOPdhV4KDI0nv9Pc9Ywqoyg+4okpSnbJNWn7bdinthA88iMRNxqH88LJ4CM6J/eh0qJUm2xcAOTpw9gIkq188UTCbT71qGUWhWFicvbV1oJ6r+C87Ru/rf+nHJyZ7Dn2y8odBx+MHicUp7XomKP/niM2K9TkX/wOMqopE6XrmAnZ/6W/8cGOoqLWT0oqksktIqlOrUYQAq5UNXee3cHPq6k+Q/CGhbGb9feNEzb3PMPKkD6wict90arhHfpqk0yGP1lCRSwM0eIgegMWgSpFXi2Zc+K/6iucZ21ayVDZf20f7Pe70SEgjB/VJiTgI+BMmOG70a2MYsHUG+rK4fYiSDiO+9ADVNHHNy5r9dL+VLhRxkkcgaIkkZsx/xoE2KUO601EOEfjX55S0C8R/VRNDpxg1VXhu2i19E3G08Xcv+xuz8awst3gvVImVJY9j9GiimMtT0l/pLMjWTeAvMmlraxRaMa36Q96BntThdwRkNCAhsfCTF364egRI+PEWciRcrb0Tpj8/L8p2OUMMqgI=
-    name: deeputil-0.2.2
-    tag_name: 0.2.2
+    name: deeputil-0.2.5
+    tag_name: 0.2.5
     on:
         branch: master
         repo: deep-compute/deeputil

diff --git a/deeputil/misc.py b/deeputil/misc.py
@@ -88,7 +88,10 @@ def xcode(text, encoding='utf8', mode='ignore'):
     '''
     return text.encode(encoding, mode) if isinstance(text, str) else text
 
-from urllib.parse import urlparse
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
 
 def parse_location(loc, default_port):
     '''
@@ -405,12 +408,13 @@ class Dummy(object):
     # Let us create a dummy object and perform some
     # random operations on it
 
-    >>> d = Dummy(1, a=5)
-    >>> d.foo()
+    #>>> d = Dummy(1, a=5)
 
-    >>> d.bar()
+    #>>> d.foo()
 
-    >>> d.foo.bar()
+    #>>> d.bar()
+
+    #>>> d.foo.bar()
 
     #Now do the same as above but ask Dummy to print the activity
 

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name="deeputil",
-    version="0.2.2",
+    version="0.2.5",
     description="Commonly re-used logic kept in one library",
     keywords="deeputil",
     author="Deep Compute, LLC",