Convert pari_share() to str

Author: jdemeyer

autogen/__init__.py

@@ -10,7 +10,7 @@
 
 def rebuild(force=False):
     pari_module_path = 'cypari2'
-    src_files = [join(pari_share(), b'pari.desc')] + \
+    src_files = [join(pari_share(), 'pari.desc')] + \
                  glob.glob(join('autogen', '*.py'))
     gen_files = [join(pari_module_path, 'auto_paridecl.pxd'),
                  join(pari_module_path, 'auto_gen.pxi')]

autogen/parser.py

@@ -44,7 +44,7 @@ def read_pari_desc():
         ...   'section': 'transcendental'}
         True
     """
-    pari_desc = os.path.join(pari_share(), b'pari.desc')
+    pari_desc = os.path.join(pari_share(), 'pari.desc')
     with io.open(pari_desc, encoding="utf-8") as f:
         lines = f.readlines()
 

autogen/paths.py

@@ -20,7 +20,7 @@
 
 
 # find_executable() returns None if nothing was found
-gppath = find_executable("gp") or ""
+gppath = find_executable("gp")
 if gppath is None:
     # This almost certainly won't work, but we need to put something here
     prefix = "."
@@ -36,14 +36,18 @@ def pari_share():
     EXAMPLES::
 
         >>> from autogen.parser import pari_share
-        >>> pari_share().endswith(b'/share/pari')
+        >>> pari_share().endswith('/share/pari')
         True
     """
     from subprocess import Popen, PIPE
     if not gppath:
         raise EnvironmentError("cannot find an installation of PARI/GP: make sure that the 'gp' program is in your $PATH")
     gp = Popen([gppath, "-f", "-q"], stdin=PIPE, stdout=PIPE)
     out = gp.communicate(b"print(default(datadir))")[0]
+    # Convert out to str if needed
+    if not isinstance(out, str):
+        from sys import getfilesystemencoding
+        out = out.decode(getfilesystemencoding(), "surrogateescape")
     datadir = out.strip()
     if not os.path.isdir(datadir):
         # As a fallback, try a path relative to the prefix