Dropped 2.X support

superbobry · superbobry · commit f8e191c8bf54 · 2021-10-11T17:17:59.000+01:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # pyte documentation build configuration file, created by
 # sphinx-quickstart on Fri Apr  8 12:49:51 2011.
 #
diff --git a/examples/capture.py b/examples/capture.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     capture
     ~~~~~~~
@@ -10,8 +9,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import print_function, unicode_literals
-
 import os
 import pty
 import signal
diff --git a/examples/debug.py b/examples/debug.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     debug
     ~~~~~
@@ -12,8 +11,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import print_function, unicode_literals
-
 import pyte
 
 # A blob of `ADOM` output we need to debug. Hey! I know this is ugly ...
diff --git a/examples/helloworld.py b/examples/helloworld.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     helloworld
     ~~~~~~~~~~
@@ -9,8 +8,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import print_function, unicode_literals
-
 import pyte
 
 
diff --git a/examples/history.py b/examples/history.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     history
     ~~~~~~~
@@ -9,16 +8,11 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import print_function, unicode_literals
-
 import os
 import random
 import string
 import sys
 
-if sys.version_info[0] == 2:
-    input = raw_input
-
 import pyte
 from pyte import modes as mo
 
diff --git a/examples/nanoterm.py b/examples/nanoterm.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     nanoterm
     ~~~~~~~~
@@ -11,8 +10,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import print_function, unicode_literals
-
 import os
 import pty
 import select
diff --git a/pyte/__init__.py b/pyte/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte
     ~~~~
@@ -23,8 +22,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import absolute_import
-
 __all__ = ("Screen", "DiffScreen", "HistoryScreen", "DebugScreen",
            "Stream", "ByteStream")
 
@@ -35,8 +32,6 @@
 
 
 if __debug__:
-    from .compat import str
-
     def dis(chars):
         """A :func:`dis.dis` for terminals.
 
diff --git a/pyte/__main__.py b/pyte/__main__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte
     ~~~~
@@ -23,8 +22,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import unicode_literals
-
 if __name__ == "__main__":
     import sys
     import pyte
diff --git a/pyte/charsets.py b/pyte/charsets.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte.charsets
     ~~~~~~~~~~~~~
@@ -17,11 +16,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import absolute_import, unicode_literals
-
-from .compat import chr, map
-
-
 #: Latin1.
 LAT1_MAP = "".join(map(chr, range(256)))
 
diff --git a/pyte/compat.py b/pyte/compat.py
diff --git a/pyte/control.py b/pyte/control.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte.control
     ~~~~~~~~~~~~
@@ -12,7 +11,6 @@
                     see AUTHORS for details.
     :license: LGPL, see LICENSE for more details.
 """
-from __future__ import unicode_literals
 
 #: *Space*: Not surprisingly -- ``" "``.
 SP = " "
diff --git a/pyte/escape.py b/pyte/escape.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte.escape
     ~~~~~~~~~~~
@@ -11,7 +10,6 @@
                     see AUTHORS for details.
     :license: LGPL, see LICENSE for more details.
 """
-from __future__ import unicode_literals
 
 #: *Reset*.
 RIS = "c"
diff --git a/pyte/graphics.py b/pyte/graphics.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte.graphics
     ~~~~~~~~~~~~~
@@ -13,8 +12,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import unicode_literals
-
 #: A mapping of ANSI text style codes to style names, "+" means the:
 #: attribute is set, "-" -- reset; example:
 #:
diff --git a/pyte/modes.py b/pyte/modes.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte.modes
     ~~~~~~~~~~
diff --git a/pyte/screens.py b/pyte/screens.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte.screens
     ~~~~~~~~~~~~
@@ -26,8 +25,6 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import absolute_import, unicode_literals, division
-
 import copy
 import json
 import math
@@ -36,23 +33,19 @@
 import unicodedata
 import warnings
 from collections import deque, namedtuple, defaultdict
+from functools import lru_cache
 
 from wcwidth import wcwidth
 
-# There is no standard 2.X backport for ``lru_cache``.
-if sys.version_info >= (3, 2):
-    from functools import lru_cache
-    wcwidth = lru_cache(maxsize=4096)(wcwidth)
-
 from . import (
     charsets as cs,
     control as ctrl,
     graphics as g,
     modes as mo
 )
-from .compat import map, range, str
 from .streams import Stream
 
+wcwidth = lru_cache(maxsize=4096)(wcwidth)
 
 #: A container for screen's scroll margins.
 Margins = namedtuple("Margins", "top bottom")
@@ -107,7 +100,7 @@ def __new__(cls, data, fg="default", bg="default", bold=False,
                                         blink)
 
 
-class Cursor(object):
+class Cursor:
     """Screen cursor.
 
     :param int x: 0-based horizontal cursor position.
@@ -144,7 +137,7 @@ def __missing__(self, key):
         return self.default
 
 
-class Screen(object):
+class Screen:
     """
     A screen is an in-memory matrix of characters that represents the
     screen display of the terminal. It can be instantiated on its own
@@ -1287,7 +1280,7 @@ def __call__(self, screen):
         return getattr(screen, self.name)(*self.args, **self.kwargs)
 
 
-class DebugScreen(object):
+class DebugScreen:
     r"""A screen which dumps a subset of the received events to a file.
 
     >>> import io
diff --git a/pyte/streams.py b/pyte/streams.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pyte.streams
     ~~~~~~~~~~~~
@@ -20,19 +19,16 @@
     :license: LGPL, see LICENSE for more details.
 """
 
-from __future__ import absolute_import, unicode_literals
-
 import codecs
 import itertools
 import re
 import warnings
 from collections import defaultdict
 
 from . import control as ctrl, escape as esc
-from .compat import pass_through_str
 
 
-class Stream(object):
+class Stream:
     """A stream is a state machine that parses a stream of bytes and
     dispatches events based on what it sees.
 
@@ -408,7 +404,7 @@ def feed(self, data):
         if self.use_utf8:
             data = self.utf8_decoder.decode(data)
         else:
-            data = pass_through_str(data)
+            data = "".join(map(chr, data))
 
         super(ByteStream, self).feed(data)
 
diff --git a/setup.py b/setup.py
@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import os
 
@@ -23,9 +22,10 @@
     "Intended Audience :: Developers",
     "Operating System :: OS Independent",
     "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
-    "Programming Language :: Python :: 2.7",
-    "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",
+    "Programming Language :: Python :: PyPy",
     "Topic :: Terminals :: Terminal Emulators/X Terminals",
 ]
 
diff --git a/tests/test_diff.py b/tests/test_diff.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import pyte
 from pyte import modes as mo
 
diff --git a/tests/test_history.py b/tests/test_history.py
@@ -1,12 +1,7 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import os
 
 import pyte
 from pyte import control as ctrl, modes as mo
-from pyte.compat import str
 
 
 def chars(history_lines, columns):
diff --git a/tests/test_input_output.py b/tests/test_input_output.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import json
 import os.path
 
diff --git a/tests/test_screen.py b/tests/test_screen.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import copy
 
 import pytest
diff --git a/tests/test_stream.py b/tests/test_stream.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-#`
`3`	`1`	`# pyte documentation build configuration file, created by`
`4`	`2`	`# sphinx-quickstart on Fri Apr 8 12:49:51 2011.`
`5`	`3`	`#`