Merge pull request #452 from ccordoba12/remove-last-py2

Remove last bits of Python 2 support

qtconsole/rich_text.py

@@ -9,8 +9,6 @@
 
 from qtpy import QtWidgets
 
-from ipython_genutils import py3compat
-
 #-----------------------------------------------------------------------------
 # Constants
 #-----------------------------------------------------------------------------
@@ -66,7 +64,7 @@ def export(self):
         if dialog.exec_():
             self.filename = dialog.selectedFiles()[0]
             choice = dialog.selectedNameFilter()
-            html = py3compat.cast_unicode(self.control.document().toHtml())
+            html = self.control.document().toHtml()
 
             # Configure the exporter.
             if choice.startswith('XHTML'):

setup.py

@@ -13,8 +13,8 @@
 import sys
 
 v = sys.version_info
-if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,3)):
-    error = "ERROR: %s requires Python version 2.7 or 3.3 or above." % name
+if v[0] >= 3 and v[:2] < (3,5)):
+    error = "ERROR: %s requires Python version 3.6 or above." % name
     print(error, file=sys.stderr)
     sys.exit(1)
 
@@ -78,7 +78,6 @@
     ],
     extras_require = {
         'test': ['flaky', 'pytest', 'pytest-qt'],
-        'test:python_version=="2.7"': ['mock'],
         'doc': 'Sphinx>=1.3',
     },
     entry_points = {
@@ -92,11 +91,11 @@
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
 )