Removed Python2 compatibility.

Author: MeanEYE

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

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

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')

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
 

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

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

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)
 

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

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)
 

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