🔥 remove feature support for python 2.7. no way back. related to #303

Author: chfw

moban/core/hashstore.py

@@ -12,9 +12,7 @@ class HashStore:
     IGNORE_CACHE_FILE = False
 
     def __init__(self):
-        self.cache_file = file_system.to_unicode(
-            constants.DEFAULT_MOBAN_CACHE_FILE
-        )
+        self.cache_file = constants.DEFAULT_MOBAN_CACHE_FILE
         if (
             file_system.exists(self.cache_file)
             and self.IGNORE_CACHE_FILE is False

moban/core/moban_factory.py

@@ -117,7 +117,6 @@ def number_of_templated_files(self):
         return self.templated_count
 
     def render_to_file(self, template_file, data_file, output_file):
-        template_file = file_system.to_unicode(template_file)
         data = self.context.get_data(data_file)
         template = self.engine.get_template(template_file)
         try:
@@ -178,7 +177,7 @@ def apply_template(self, template_abs_path, template, data, output_file):
             return flag
         except exceptions.FileNotFound:
             # the template is a string from command line
-            LOG.info("{} is not a file".format(template_abs_path))
+            LOG.info(f"{template_abs_path} is not a file")
             self.buffered_writer.write_file_out(output_file, rendered_content)
             return True
 
@@ -197,7 +196,7 @@ def _render_with_finding_template_first(self, template_file_index):
         for (template_file, data_output_pairs) in template_file_index.items():
             template = self.engine.get_template(template_file)
             template_abs_path = self.template_fs.geturl(
-                file_system.to_unicode(template_file), purpose="fs"
+                template_file, purpose="fs"
             )
             for (data_file, output) in data_output_pairs:
                 data = self.context.get_data(data_file)
@@ -217,7 +216,7 @@ def _render_with_finding_data_first(self, data_file_index):
             for (template_file, output) in template_output_pairs:
                 template = self.engine.get_template(template_file)
                 template_abs_path = self.template_fs.geturl(
-                    file_system.to_unicode(template_file), purpose="fs"
+                    template_file, purpose="fs"
                 )
                 flag = self.apply_template(
                     template_abs_path, template, data, output
@@ -240,7 +239,7 @@ def expand_template_directories(dirs):
 
 
 def expand_template_directory(directory):
-    LOG.debug("Expanding %s..." % directory)
+    LOG.debug(f"Expanding {directory}...")
     translated_directory = None
     if ":" in directory and directory[1] != ":" and "://" not in directory:
         translated_directory = deprecated_moban_path_notation(directory)

moban/core/mobanfile/templates.py

@@ -10,7 +10,7 @@
 def handle_template(template_file, output, template_dirs):
     LOG.info("handling %s" % template_file)
 
-    template_file = file_system.to_unicode(template_file)
+    template_file = template_file
     multi_fs = file_system.get_multi_fs(template_dirs)
     if template_file.endswith("**"):
         source_dir = template_file[:-3]

moban/externals/buffered_writer.py

@@ -22,15 +22,11 @@ def write_file_out(self, filename, content):
     def write_file_out_to_zip(self, filename, content):
         zip_file, file_name = file_system.url_split(filename)
         if zip_file not in self.fs_list:
-            self.fs_list[zip_file] = fs.open_fs(
-                file_system.to_unicode(zip_file), create=True
-            )
+            self.fs_list[zip_file] = fs.open_fs(zip_file, create=True)
         base_dirs = fs.path.dirname(file_name)
         if not self.fs_list[zip_file].exists(base_dirs):
             self.fs_list[zip_file].makedirs(base_dirs)
-        self.fs_list[zip_file].writebytes(
-            file_system.to_unicode(file_name), content
-        )
+        self.fs_list[zip_file].writebytes(file_name, content)
 
     def close(self):
         for fsx in self.fs_list.values():

moban/externals/file_system.py

@@ -27,9 +27,9 @@
 def url_join(path, path2):
     result = urlparse(path)
     if result.scheme and path.endswith(result.scheme):
-        return path + to_unicode("!/") + path2
+        return f"{path}!/{path2}"
     else:
-        return path + to_unicode("/") + path2
+        return f"{path}/{path2}"
 
 
 def log_fs_failure(function_in_this_module):
@@ -53,7 +53,6 @@ def wrapper(*args, **kwds):
 @log_fs_failure
 @contextmanager
 def open_fs(path):
-    path = to_unicode(path)
     if is_zip_alike_url(path):
         zip_file, folder = url_split(path)
         the_fs = fs.open_fs(zip_file)
@@ -68,7 +67,6 @@ def open_fs(path):
 @log_fs_failure
 @contextmanager
 def open_file(path):
-    path = to_unicode(path)
     if is_zip_alike_url(path):
         zip_file, folder = url_split(path)
         the_fs = fs.open_fs(zip_file)
@@ -88,7 +86,6 @@ def open_file(path):
 @log_fs_failure
 @contextmanager
 def open_binary_file(path):
-    path = to_unicode(path)
     if is_zip_alike_url(path):
         zip_file, folder = url_split(path)
         the_fs = fs.open_fs(zip_file)
@@ -123,7 +120,6 @@ def read_bytes(path):
 
 @log_fs_failure
 def write_bytes(filename, bytes_content):
-    filename = to_unicode(filename)
     if "://" in filename:
         zip_file, folder = url_split(filename)
         with fs.open_fs(zip_file, create=True) as the_fs:
@@ -150,8 +146,6 @@ def is_file(path):
 
 
 def exists(path):
-    path = to_unicode(path)
-
     if is_zip_alike_url(path):
         zip_file, folder = url_split(path)
         try:
@@ -179,7 +173,6 @@ def exists(path):
 
 @log_fs_failure
 def list_dir(path):
-    path = to_unicode(path)
     folder_or_file, path = _path_split(path)
     with fs.open_fs(folder_or_file) as the_fs:
         for file_name in the_fs.listdir(path):
@@ -188,31 +181,26 @@ def list_dir(path):
 
 @log_fs_failure
 def abspath(path):
-    path = to_unicode(path)
     folder_or_file, path = _path_split(path)
     with fs.open_fs(folder_or_file) as the_fs:
         return the_fs.getsyspath(path)
 
 
 @log_fs_failure
 def fs_url(path):
-    path = to_unicode(path)
     folder_or_file, path = _path_split(path)
     with fs.open_fs(folder_or_file) as the_fs:
         return the_fs.geturl(path, purpose="fs")
 
 
 @log_fs_failure
 def system_path(path):
-    path = to_unicode(path)
     folder_or_file, path = _path_split(path)
     with fs.open_fs(folder_or_file) as the_fs:
         return the_fs.getsyspath(path)
 
 
 def to_unicode(path):
-    if PY2 and path.__class__.__name__ != "unicode":
-        return u"".__class__(path)
     return path
 
 
@@ -258,7 +246,6 @@ def url_split(url):
 
 
 def _path_split(url_or_path):
-    url_or_path = to_unicode(url_or_path)
     if is_zip_alike_url(url_or_path):
         return url_split(url_or_path)
     else:

moban/plugins/copy.py

@@ -28,9 +28,7 @@ def __init__(self, template_fs, extensions=None):
         self.template_fs = template_fs
 
     def get_template(self, template_file):
-        return self.template_fs.readbytes(
-            file_system.to_unicode(template_file)
-        )
+        return self.template_fs.readbytes(template_file)
 
     def get_template_from_string(self, string):
         return string