Merge pull request #11 from amakhnach/feature/support_python3

NEW: Added decoding of repo_dir for get_git_repo_dir.
kpn · May 19, 2016 · af1678f · af1678f
2 parents 3298a11 + bd30e00
commit af1678f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkgversion/pkgversion.py b/pkgversion/pkgversion.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import locale
 import os
 import pprint
 import re
@@ -27,6 +28,14 @@ def get_git_repo_dir():
     repo_dir = repo_dir.strip()
     if not repo_dir:
         repo_dir = None
+
+    if repo_dir and not isinstance(repo_dir, str):
+
+        encoding = locale.getpreferredencoding()
+
+        if encoding:
+            return repo_dir.decode(encoding)
+
     return repo_dir
 
 

diff --git a/tests/test_pkgversion.py b/tests/test_pkgversion.py
@@ -64,15 +64,15 @@ def test_pep440_version(self):
     def test_list_requirements(self):
         actual = list_requirements(requirements_file)
         expected = [
-            'unversioned', 'pinned-version==1.0',
-            'ranged-version<=2,>=1.0', 'url', 'unversioned-url',
+            'unversioned', 'pinned_version==1.0',
+            'ranged_version<=2,>=1.0', 'url', 'unversioned_url',
             'editable'
         ]
         assert actual == expected
 
     def test_get_git_repo_dir(self):
         assert os.path.isdir(get_git_repo_dir())
-        assert os.path.isdir(os.path.join(get_git_repo_dir(), b'.git'))
+        assert os.path.isdir(os.path.join(get_git_repo_dir(), '.git'))
 
     def test_get_git_repo_dir_invalid(self):
         pwd = os.getcwd()