Merge pull request #180 from pypa/hotfix/issue-179

Fix unicode handling for version_scheme

Author: RonnyPfannschmidt

setuptools_scm/version.py

@@ -22,13 +22,14 @@ def _warn_if_setuptools_outdated():
 
 def callable_or_entrypoint(group, callable_or_name):
     trace('ep', (group, callable_or_name))
-    if isinstance(callable_or_name, str):
-        for ep in iter_entry_points(group, callable_or_name):
-            trace("ep found:", ep.name)
-            return ep.load()
-    else:
+
+    if callable(callable_or_name):
         return callable_or_name
 
+    for ep in iter_entry_points(group, callable_or_name):
+        trace("ep found:", ep.name)
+        return ep.load()
+
 
 def tag_to_version(tag):
     trace('tag', tag)

testing/test_git.py

@@ -39,6 +39,12 @@ def test_version_from_git(wd):
     assert wd.version.startswith('0.2')
 
 
+@pytest.mark.issue(179)
+def test_unicode_version_scheme(wd):
+    scheme = b'guess-next-dev'.decode('ascii')
+    assert wd.get_version(version_scheme=scheme)
+
+
 @pytest.mark.issue(108)
 @pytest.mark.issue(109)
 def test_git_worktree(wd):