Removing polyglot getcwd and getenv

ebook_converter/ebooks/metadata/__init__.py

@@ -9,7 +9,7 @@ import urllib.parse
 
 from ebook_converter import relpath, guess_type, prints, force_unicode
 from ebook_converter.utils.config_base import tweaks
-from ebook_converter.polyglot.builtins import getcwd, iteritems, itervalues, as_unicode
+from ebook_converter.polyglot.builtins import iteritems, itervalues, as_unicode
 from ebook_converter.polyglot.urllib import unquote
 
 
@@ -225,7 +225,7 @@ class Resource(object):
 
     '''
 
-    def __init__(self, href_or_path, basedir=getcwd(), is_path=True):
+    def __init__(self, href_or_path, basedir=os.getcwd(), is_path=True):
         self._href = None
         self._basedir = basedir
         self.path = None
@@ -267,7 +267,7 @@ class Resource(object):
             if self._basedir:
                 basedir = self._basedir
             else:
-                basedir = getcwd()
+                basedir = os.getcwd()
         if self.path is None:
             return self._href
         f = self.fragment.encode('utf-8') if isinstance(self.fragment, str) else self.fragment

ebook_converter/ebooks/metadata/meta.py

@@ -6,7 +6,6 @@ from ebook_converter.ebooks.metadata.opf2 import OPF
 from ebook_converter import isbytestring
 from ebook_converter.customize.ui import get_file_type_metadata, set_file_type_metadata
 from ebook_converter.ebooks.metadata import MetaInformation, string_to_authors
-from ebook_converter.polyglot.builtins import getcwd
 
 
 __license__ = 'GPL v3'
@@ -201,7 +200,7 @@ def metadata_from_filename(name, pat=None, fallback_pat=None):
 def opf_metadata(opfpath):
     if hasattr(opfpath, 'read'):
         f = opfpath
-        opfpath = getattr(f, 'name', getcwd())
+        opfpath = getattr(f, 'name', os.getcwd())
     else:
         f = open(opfpath, 'rb')
     try:

ebook_converter/ebooks/metadata/opf2.py

@@ -27,7 +27,7 @@ from ebook_converter import prints, guess_type
 from ebook_converter.utils.cleantext import clean_ascii_chars, clean_xml_chars
 from ebook_converter.utils.config import tweaks
 from ebook_converter.utils.xml_parse import safe_xml_fromstring
-from ebook_converter.polyglot.builtins import iteritems, getcwd
+from ebook_converter.polyglot.builtins import iteritems
 from ebook_converter.polyglot.urllib import unquote
 
 
@@ -65,7 +65,7 @@ class Resource(object):  # {{{
     :method:`href`
     '''
 
-    def __init__(self, href_or_path, basedir=getcwd(), is_path=True):
+    def __init__(self, href_or_path, basedir=os.getcwd(), is_path=True):
         self.orig = href_or_path
         self._href = None
         self._basedir = basedir
@@ -109,7 +109,7 @@ class Resource(object):  # {{{
             if self._basedir:
                 basedir = self._basedir
             else:
-                basedir = getcwd()
+                basedir = os.getcwd()
         if self.path is None:
             return self._href
         frag = ('#' + self.fragment) if self.fragment else ''
@@ -400,7 +400,7 @@ class Guide(ResourceCollection):  # {{{
             return ans + '/>'
 
     @staticmethod
-    def from_opf_guide(references, base_dir=getcwd()):
+    def from_opf_guide(references, base_dir=os.getcwd()):
         coll = Guide()
         for ref in references:
             try:
@@ -589,7 +589,7 @@ class OPF(object):  # {{{
     author_link_map = MetadataField('author_link_map', is_dc=False,
                                 formatter=json.loads, renderer=dump_dict)
 
-    def __init__(self, stream, basedir=getcwd(), unquote_urls=True,
+    def __init__(self, stream, basedir=os.getcwd(), unquote_urls=True,
             populate_spine=True, try_to_guess_cover=True, preparsed_opf=None, read_toc=True):
         self.try_to_guess_cover = try_to_guess_cover
         self.basedir  = self.base_dir = basedir
@@ -1756,7 +1756,7 @@ b'''\
 </package>
 '''
         )
-        self.opf = OPF(self.stream, getcwd())
+        self.opf = OPF(self.stream, os.getcwd())
 
     def testReading(self, opf=None):
         if opf is None:
@@ -1787,11 +1787,11 @@ b'''\
         self.opf.render()
 
     def testCreator(self):
-        opf = OPFCreator(getcwd(), self.opf)
+        opf = OPFCreator(os.getcwd(), self.opf)
         buf = io.BytesIO()
         opf.render(buf)
         raw = buf.getvalue()
-        self.testReading(opf=OPF(io.BytesIO(raw), getcwd()))
+        self.testReading(opf=OPF(io.BytesIO(raw), os.getcwd()))
 
     def testSmartUpdate(self):
         self.opf.smart_update(MetaInformation(self.opf))
@@ -1818,7 +1818,7 @@ def test_user_metadata():
         }
     mi.set_all_user_metadata(um)
     raw = metadata_to_opf(mi)
-    opfc = OPFCreator(getcwd(), other=mi)
+    opfc = OPFCreator(os.getcwd(), other=mi)
     out = io.BytesIO()
     opfc.render(out)
     raw2 = out.getvalue()

ebook_converter/ebooks/metadata/toc.py

@@ -12,7 +12,6 @@ from ebook_converter.constants import __appname__, __version__
 from ebook_converter.ebooks.chardet import xml_to_unicode
 from ebook_converter.utils.xml_parse import safe_xml_fromstring
 from ebook_converter.utils.cleantext import clean_xml_chars
-from ebook_converter.polyglot.builtins import getcwd
 from ebook_converter.polyglot.urllib import unquote
 
 
@@ -49,7 +48,7 @@ def parse_html_toc(data):
 class TOC(list):
 
     def __init__(self, href=None, fragment=None, text=None, parent=None,
-            play_order=0, base_path=getcwd(), type='unknown', author=None,
+            play_order=0, base_path=os.getcwd(), type='unknown', author=None,
             description=None, toc_thumbnail=None):
         self.href = href
         self.fragment = fragment