Bump major version to drop Python2 support.

If any project still needs a Python2 compatible yapsy,
they must add the <2 constraints in their yapsy requirements.

The other main breaking change here is to drop the compat.py file
and its global variables.

Author: tibonihoo

.travis.yml

@@ -1,3 +1,6 @@
+version-2.0.0 [????]
+  - code: Python2 support is dropped, compat.py and its variables are gone.
+
 version-1.12.0 [2018-09-02]
   - code: fix yapsy on python3.6
   - code: Make the test more robust to "unusual" unpacking of the module (see: https://sourceforge.net/p/yapsy/bugs/32/)

package/CHANGELOG.txt

@@ -5,9 +5,6 @@ with the following two exceptions:
   Attribution-Share Alike 3.0 by Thibauld Nion (see
   artwork/LICENSE.txt)
 
-- the compat.py file is licensed under the ISC License by Kenneth
-  Reitz (see yapsy/compat.py).
-
 
 --------------------
 BSD 2-clause license

package/LICENSE.txt

@@ -59,7 +59,6 @@
 					 'License :: OSI Approved :: BSD License',
 					 'Operating System :: OS Independent',
 					 'Programming Language :: Python',
-					 'Programming Language :: Python :: 2',
 					 'Programming Language :: Python :: 3',
 					 'Topic :: Software Development :: Libraries :: Python Modules'],
 		platforms='All',

package/setup.py

@@ -5,7 +5,7 @@
 import os 
 import unittest
 
-from yapsy.compat import ConfigParser
+from configparser import ConfigParser
 from yapsy.ConfigurablePluginManager import ConfigurablePluginManager
 
 

package/test/test_ConfigPlugin.py

@@ -4,7 +4,8 @@
 import unittest
 import sys
 import os
-from yapsy.compat import ConfigParser, StringIO, str, builtin_str
+from configparser import ConfigParser
+from io import StringIO
 import tempfile
 import shutil
 
@@ -77,18 +78,7 @@ def test_isValid_WithMultiExtensions(self):
 		self.assertFalse(analyzer.isValidPlugin(self.version_plugin_path))
 		self.assertTrue(analyzer.isValidPlugin(self.yapsy_filter_plugin_path))
 
-	def test__extractCorePluginInfo_with_builtin_str_filename(self):
-		plugin_desc_content = builtin_str("simpleplugin.yapsy-plugin")
-		analyzer = PluginFileAnalyzerWithInfoFile("mouf", ("yapsy-plugin"))
-		infos, parser = analyzer._extractCorePluginInfo(self.plugin_directory,
-														plugin_desc_content)
-		self.assertEqual("Simple Plugin", infos["name"])
-		self.assertEqual(os.path.join(self.plugin_directory, "SimplePlugin"), infos["path"])
-
-	def test__extractCorePluginInfo_with_unicode_filename(self):
-		"""Note: this test is redundant with its 'builtin_str' counterpart on Python3
-		but not on Python2"""
-		# Note: compat.py redefines str as unicode for Python2
+	def test__extractCorePluginInfo_with_str_filename(self):
 		plugin_desc_content = str("simpleplugin.yapsy-plugin")
 		analyzer = PluginFileAnalyzerWithInfoFile("mouf", ("yapsy-plugin"))
 		infos, parser = analyzer._extractCorePluginInfo(self.plugin_directory,

package/test/test_PluginFileLocator.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8; tab-width: 4; indent-tabs-mode: t; python-indent: 4 -*-
 
 import test_settings
-from yapsy.compat import ConfigParser
+from configparser import ConfigParser
 import unittest
 
 

package/test/test_PluginInfo.py

@@ -9,7 +9,7 @@
 from yapsy.PluginFileLocator import PluginFileLocator
 from yapsy.PluginFileLocator import IPluginFileAnalyzer
 from yapsy import NormalizePluginNameForModuleName
-from yapsy.compat import ConfigParser
+from configparser import ConfigParser
 
 class YapsyUtils(unittest.TestCase):
 

package/test/test_SimplePlugin.py

@@ -8,7 +8,7 @@
 from yapsy.ConfigurablePluginManager import ConfigurablePluginManager
 from yapsy.VersionedPluginManager import VersionedPluginManager
 from yapsy.PluginManager import PluginManagerSingleton
-from yapsy.compat import ConfigParser
+from configparser import ConfigParser
 
 
 """

package/test/test_Singleton.py

@@ -19,7 +19,7 @@
 from yapsy.IPlugin import IPlugin
 from yapsy.PluginManagerDecorator import PluginManagerDecorator
 from yapsy import log
-from yapsy.compat import StringIO, str
+from io import StringIO
 
 
 class AutoInstallPluginManager(PluginManagerDecorator):

package/yapsy/AutoInstallPluginManager.py

@@ -55,14 +55,16 @@
 
 import os
 import re
+from configparser import ConfigParser
+
 from yapsy import log
-from yapsy.compat import ConfigParser, is_py2, basestring
 
 from yapsy.PluginInfo import PluginInfo
 from yapsy import PLUGIN_NAME_FORBIDEN_STRING
 from yapsy.IPluginLocator import IPluginLocator
 
 
+_BASIC_STRING_CLASSES = (str, bytes)
 
 
 class IPluginFileAnalyzer(object):
@@ -180,10 +182,7 @@ def getPluginNameAndModuleFromStream(self, infoFileObject, candidate_infofile=No
 		# parse the information buffer to get info about the plugin
 		config_parser = ConfigParser()
 		try:
-			if is_py2:
-				config_parser.readfp(infoFileObject)
-			else:
-				config_parser.read_file(infoFileObject)
+			config_parser.read_file(infoFileObject)
 		except Exception as e:
 			log.debug("Could not parse the plugin file '%s' (exception raised was '%s')" % (candidate_infofile,e))
 			return (None, None, None)
@@ -216,7 +215,7 @@ def _extractCorePluginInfo(self,directory, filename):
 		          and decorators.
 		"""
 		# now we can consider the file as a serious candidate
-		if not isinstance(filename, basestring):
+		if not isinstance(filename, _BASIC_STRING_CLASSES):
 			# filename is a file object: use it
 			name, moduleName, config_parser = self.getPluginNameAndModuleFromStream(filename)
 		else:
@@ -514,7 +513,7 @@ def setPluginPlaces(self, directories_list):
 		"""
 		Set the list of directories where to look for plugin places.
 		"""
-		if isinstance(directories_list, basestring):
+		if isinstance(directories_list, _BASIC_STRING_CLASSES):
 			raise ValueError("'directories_list' given as a string, but expected to be a list or enumeration of strings")
 		if directories_list is None:
 			directories_list = [os.path.dirname(__file__)]

package/yapsy/PluginFileLocator.py

@@ -11,7 +11,7 @@
 ===
 """
 
-from yapsy.compat import ConfigParser
+from configparser import ConfigParser
 from distutils.version import StrictVersion
 
 

package/yapsy/PluginInfo.py

@@ -52,7 +52,7 @@
 
 """
 
-__version__="1.12.2"
+__version__="2.0.0"
 
 # tell epydoc that the documentation is in the reStructuredText format
 __docformat__ = "restructuredtext en"
@@ -70,12 +70,7 @@
 """
 
 import re
-from yapsy.compat import is_py2, str
-
-if is_py2:
-	RE_NON_ALPHANUM = re.compile("\W", re.U)
-else:
-	RE_NON_ALPHANUM = re.compile("\W")
+RE_NON_ALPHANUM = re.compile("\W")
 
 
 def NormalizePluginNameForModuleName(pluginName):
@@ -85,13 +80,9 @@ def NormalizePluginNameForModuleName(pluginName):
 	.. note:: may do a little more modifications than strictly
 	          necessary and is not optimized for speed.
 	"""
-	if is_py2:
-		pluginName = str(pluginName, 'utf-8')
 	if len(pluginName)==0:
 		return "_"
 	if pluginName[0].isdigit():
 		pluginName = "_" + pluginName
 	ret = RE_NON_ALPHANUM.sub("_",pluginName)
-	if is_py2:
-		ret = ret.encode('utf-8')
 	return ret

package/yapsy/__init__.py

@@ -10,7 +10,6 @@ activate_release_env
 # Generate package
 rm -r $PACKAGE_DIR/build 
 rm -r $PACKAGE_DIR/dist
-python $PACKAGE_DIR/setup.py sdist bdist_egg
 python3 $PACKAGE_DIR/setup.py bdist_egg
 
 # Upload the package