diff --git a/sunflower/__main__.py b/sunflower/__main__.py index 47b8b4f19..8ba74c485 100755 --- a/sunflower/__main__.py +++ b/sunflower/__main__.py @@ -24,11 +24,6 @@ import sys -if sys.version_info[0] == 2: - reload(sys) - sys.setdefaultencoding('utf8') - sys.path.append(os.path.dirname(__file__)) # Not necessary for us, but it might help old plugins - try: # check if gtk is available import gi diff --git a/sunflower/associations.py b/sunflower/associations.py index ee475296b..56b3058ed 100644 --- a/sunflower/associations.py +++ b/sunflower/associations.py @@ -1,10 +1,5 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() - import os import shlex import subprocess diff --git a/sunflower/common.py b/sunflower/common.py index 8e8abcdc8..d34388702 100644 --- a/sunflower/common.py +++ b/sunflower/common.py @@ -193,9 +193,6 @@ def load_translation(): def decode_file_name(file_name): """Replace surrogate codepoints in a filename with a replacement character to display non-UTF-8 filenames.""" - if sys.version_info[0] == 2: - return file_name - if isinstance(file_name, bytes): return file_name.decode('utf-8', 'replace') @@ -204,7 +201,4 @@ def decode_file_name(file_name): def encode_file_name(file_name): """Encode filename to bytes so it can be passed to GI APIs that expect a file name (and specify `filename` as their argument type in the GIR bindings).""" - if sys.version_info[0] == 2: - return file_name - return str(file_name).encode('utf-8', 'surrogateescape') diff --git a/sunflower/operation.py b/sunflower/operation.py index 066cc1111..fd6e92529 100644 --- a/sunflower/operation.py +++ b/sunflower/operation.py @@ -1,10 +1,5 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() - import os import fnmatch diff --git a/sunflower/plugin_base/item_list.py b/sunflower/plugin_base/item_list.py index f506f9ce3..529cac8c5 100644 --- a/sunflower/plugin_base/item_list.py +++ b/sunflower/plugin_base/item_list.py @@ -1,8 +1,4 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() import os import urllib.parse diff --git a/sunflower/plugin_base/monitor.py b/sunflower/plugin_base/monitor.py index f095ccf03..cd0ab8221 100644 --- a/sunflower/plugin_base/monitor.py +++ b/sunflower/plugin_base/monitor.py @@ -1,8 +1,4 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() from gi.repository import GObject from queue import Queue, Empty as QueueEmptyException diff --git a/sunflower/plugins/file_list/file_list.py b/sunflower/plugins/file_list/file_list.py index d36683c53..c0c38237c 100644 --- a/sunflower/plugins/file_list/file_list.py +++ b/sunflower/plugins/file_list/file_list.py @@ -66,9 +66,6 @@ def __init__(self, parent, notebook, options): self.scheme = 'file' self.path = self._options.get('path', os.path.expanduser('~')) - if sys.version_info[0] == 2 and type(self.path) == unicode: - self.path = self.path.encode('utf-8') - self._sort_column = self._options.get('sort_column', 0) self._sort_ascending = self._options.get('sort_ascending', True) diff --git a/sunflower/plugins/file_list/gio_provider.py b/sunflower/plugins/file_list/gio_provider.py index b68b2eb68..7cc7e2caa 100644 --- a/sunflower/plugins/file_list/gio_provider.py +++ b/sunflower/plugins/file_list/gio_provider.py @@ -1,10 +1,5 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() - import os from gi.repository import Gio, GLib diff --git a/sunflower/plugins/file_list/local_provider.py b/sunflower/plugins/file_list/local_provider.py index 8e72380d1..405a536b2 100644 --- a/sunflower/plugins/file_list/local_provider.py +++ b/sunflower/plugins/file_list/local_provider.py @@ -230,8 +230,6 @@ def rename_path(self, source, destination, relative_to=None): def list_dir(self, path, relative_to=None): """Get directory list""" - if sys.version_info[0] == 2 and type(path) == unicode: - path = path.encode('utf-8') real_path = self.real_path(path, relative_to) return os.listdir(real_path) diff --git a/sunflower/queue.py b/sunflower/queue.py index 4f50d7b5a..2d49558db 100644 --- a/sunflower/queue.py +++ b/sunflower/queue.py @@ -1,11 +1,6 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() from gi.repository import Gtk - from threading import Lock from queue import Queue, Empty diff --git a/sunflower/tools/version_check.py b/sunflower/tools/version_check.py index d46fea0f9..0ae63e401 100644 --- a/sunflower/tools/version_check.py +++ b/sunflower/tools/version_check.py @@ -1,12 +1,7 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() - -from urllib.request import urlopen from gi.repository import Gtk, Gdk, GObject +from urllib.request import urlopen from json import JSONDecoder from threading import Thread @@ -22,7 +17,6 @@ class VersionCheck: def __init__(self, application): self._dialog = Gtk.Window(type=Gtk.WindowType.TOPLEVEL) - self._application = application # configure window diff --git a/sunflower/widgets/location_menu.py b/sunflower/widgets/location_menu.py index afe86ec40..b9fe569cd 100644 --- a/sunflower/widgets/location_menu.py +++ b/sunflower/widgets/location_menu.py @@ -1,10 +1,5 @@ from __future__ import absolute_import -import sys -if sys.version_info[0] == 2: - import future.standard_library - future.standard_library.install_aliases() - import os import urllib.parse