stop supporting python2 at all, remove eye.three

docs/eye.rst

@@ -30,6 +30,5 @@ Submodules
    eye.qt
    eye.reutils
    eye.structs
-   eye.three
    eye.utils
 

eye/app.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # this project is licensed under the WTFPLv2, see COPYING.txt for details
 
 import argparse
@@ -12,7 +12,6 @@
 
 qApp = lambda: QApplication.instance()
 
-from .three import execfile
 from .qt import Slot
 from . import pathutils
 from . import connector
@@ -181,6 +180,14 @@ def setupLogging():
 	root.handlers[0].setLevel(logging.WARNING)
 
 
+def execfile(path, globals):
+	"""Exec Python `file` with `globals` as in Python 2"""
+	with open(path) as fd:
+		src = fd.read()
+	code = compile(src, path, 'exec')
+	exec(code, globals)  # pylint: disable=exec-used
+
+
 def main():
 	"""Run eye app"""
 

eye/colorutils.py

@@ -9,7 +9,6 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QColor
 
-from .three import bytes, str
 
 __all__ = ('QColorAlpha', 'QColor')
 

eye/connector.py

@@ -56,7 +56,6 @@ def foo(editor_obj, path):
 from PyQt5.QtWidgets import QWidget
 
 from .qt import Signal, Slot
-from .three import bytes, str
 from .utils import exceptionLogging
 from . import BUILDING_DOCS, _addDoc
 

eye/helpers/_lexercolorgroups.py

@@ -2,7 +2,6 @@
 
 from PyQt5.Qsci import QsciLexerPython, QsciLexerCPP, QsciLexerBash, QsciLexerCSS
 
-from ..three import range
 
 # TODO case insensitive
 

eye/helpers/actions.py

@@ -39,7 +39,6 @@ def myActionFunc(ed):
 from PyQt5.QtWidgets import QAction
 from PyQt5.Qsci import QsciCommand, QsciScintilla
 
-from ..three import bytes, str
 from ..connector import categoryObjects, CONNECTOR
 from ..qt import Slot
 from .. import BUILDING_DOCS

eye/helpers/confcache.py

@@ -5,7 +5,6 @@
 from PyQt5.QtCore import QObject
 
 from ..qt import Slot
-from ..three import str
 from .file_monitor import MonitorWithRename
 
 

eye/helpers/editor_search.py

@@ -8,7 +8,6 @@
 from ..connector import registerSignal, CategoryMixin
 from ..widgets.editor import HasWeakEditorMixin, SciModification
 from ..widgets import minibuffer
-from ..three import range
 from ..qt import Signal, Slot
 from .. import structs
 from . import buffers

eye/helpers/file_monitor.py

@@ -9,7 +9,6 @@
 
 from PyQt5.QtCore import QFileSystemWatcher, QSignalMapper, QObject
 
-from ..three import str
 from ..qt import Signal, Slot
 from ..connector import registerSignal, disabled
 

eye/helpers/file_search_plugins/base.py

@@ -2,7 +2,6 @@
 
 from PyQt5.QtCore import QObject
 
-from ...three import str
 from ...qt import Signal, Slot
 
 

eye/helpers/keys.py

@@ -64,7 +64,6 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QKeySequence
 
-from ..three import str
 from .actions import registerActionShortcut
 from ..pathutils import getConfigFilePath
 

eye/helpers/lexercolor.py

@@ -101,7 +101,6 @@
 from six.moves.configparser import SafeConfigParser
 from logging import getLogger
 
-from ..three import str
 from ..connector import categoryObjects, registerSignal, registerSetup, disabled
 from ..colorutils import QColorAlpha
 from ..lexers import stylesFromLexer

eye/helpers/minimap.py

@@ -8,7 +8,6 @@
 from ..widgets.editor import Editor, SciModification
 from ..widgets.window import Window
 from ..widgets.helpers import acceptIf
-from ..three import range
 from ..qt import Signal, Slot
 
 

eye/helpers/remote_control.py

@@ -7,7 +7,6 @@
 from PyQt5.QtCore import QObject, Q_CLASSINFO
 from PyQt5.QtDBus import QDBusConnection, QDBusVariant, QDBusMessage
 
-from ..three import str
 from ..connector import disabled, CategoryMixin
 from ..app import qApp
 from ..qt import Slot

eye/helpers/script_reload.py

@@ -17,7 +17,6 @@
 import logging
 import os
 
-from ..three import str
 from ..app import qApp
 from ..connector import deleteCreatedBy
 from ..qt import Slot

eye/helpers/session.py

@@ -9,7 +9,6 @@
 import json
 import os
 
-from ..three import range, bytes
 from ..connector import categoryObjects
 from ..pathutils import getConfigFilePath
 from ..widgets.window import Window

eye/helpers/ycm/daemon.py

@@ -20,7 +20,6 @@
 from PyQt5.QtCore import QObject, QTimer, QProcess, QUrl
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest
 
-from ...three import str, bytes
 from ...connector import CategoryMixin
 from ...qt import Signal, Slot
 from ...app import qApp

eye/procutils.py

@@ -5,7 +5,6 @@
 
 from PyQt5.QtCore import QProcess
 
-from .three import str, bytes
 from .qt import Signal, Slot
 
 

eye/widgets/editor.py

@@ -11,12 +11,11 @@
 Positions in the text of an editor widget can be expressed in multiple ways.
 
 First, the position of a character can be expressed as "line-index", which is the line and column of
-that character, in terms of Unicode codepoints, with the `str` type (`unicode` for Python 2,
-see :doc:`eye.three`).
+that character, in terms of Unicode codepoints, with the `str` type.
 Unless specified otherwise, line and column numbers start at 0 in EYE.
 
-Another way, more low-level, is the byte offset of the byte in the byte text (with type `bytes`, see
-:doc:`eye.three`). The internal byte encoding of the editor is UTF-8, regardless of the encoding of
+Another way, more low-level, is the byte offset of the byte in the byte text (with type `bytes`).
+The internal byte encoding of the editor is UTF-8, regardless of the encoding of
 the underlying disk file, which only intervenes when loading/saving.
 
 Module contents
@@ -38,7 +37,6 @@
 import sip
 import six
 
-from ..three import bytes, str
 from ..connector import disabled, registerEventFilter
 from .helpers import CentralWidgetMixin, acceptIf
 from ..qt import Slot, Signal, override

eye/widgets/eval_console.py

@@ -16,7 +16,6 @@
 from PyQt5.QtWidgets import QVBoxLayout, QLineEdit, QPlainTextEdit, QWidget, QAction, QCompleter
 from six import StringIO
 
-from ..three import bytes
 from ..app import qApp
 from ..utils import exceptionLogging
 from ..qt import Signal, Slot

eye/widgets/filechooser.py

@@ -8,7 +8,6 @@
 import re
 from time import time
 
-from ..three import str, range
 from ..structs import PropDict
 from ..consts import AbsolutePathRole
 from ..qt import Slot

eye/widgets/locationlist.py

@@ -11,7 +11,6 @@
 from PyQt5.QtGui import QStandardItemModel, QStandardItem
 from PyQt5.QtWidgets import QTreeView
 
-from ..three import str
 from .helpers import WidgetMixin
 from .. import consts
 from ..consts import AbsolutePathRole

eye/widgets/minibuffer.py

@@ -4,7 +4,6 @@
 from PyQt5.QtGui import QKeySequence
 from PyQt5.QtWidgets import QLineEdit, QShortcut
 
-from ..three import str
 from ..app import qApp
 from ..connector import categoryObjects
 from ..qt import Signal, Slot

eye/widgets/search.py

@@ -6,7 +6,6 @@
 
 import os
 
-from ..three import str
 from .. import consts
 from .helpers import WidgetMixin
 from ..helpers import file_search, buffers

eye/widgets/tabs.py

@@ -8,7 +8,6 @@
 from PyQt5.QtWidgets import QTabWidget, QTabBar, QStackedWidget, QToolButton, QMenu
 
 from .. import consts
-from ..three import str
 from ..qt import Signal, Slot, override
 from ..connector import CategoryMixin, disabled, registerSetup
 from .droparea import DropAreaMixin, BandMixin

eye/widgets/window.py

@@ -8,7 +8,6 @@
 from PyQt5.QtWidgets import QMainWindow, QFileDialog, QDockWidget, QWidget
 
 from ..connector import registerSignal, disabled
-from ..three import str
 from ..qt import Signal, Slot
 from .. import consts
 from .helpers import CategoryMixin, acceptIf, parentTabWidget

main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # this project is licensed under the WTFPLv2, see COPYING.txt for details
 
 import sys

setup.cfg

@@ -19,20 +19,16 @@ classifier =
     License :: Public Domain
     Topic :: Text Editors
     Topic :: Text Editors :: Integrated Development Environments (IDE)
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.2
-    Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
 
 
 [options]
 zip_safe = 0
+python_requires = >=3.3
 install_requires =
-    six
     PyQt5
     QScintilla
     pyxdg

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # this project is licensed under the WTFPLv2, see COPYING.txt for details
 
 import glob