Drop some compat for python < 2.6 (#409)

* Drop python < 2.4 compat in apply_target_encoding()

* Drop compat about bytes for python < 2.6

Support for python 2.4 and 2.5 got dropped in version 1.2.0.
Also, these declarations confuse mypy.

---------

Co-authored-by: Maxim Ivanov <ulidtko@gmail.com>

10 files changed, 9 insertions, 20 deletions

diff --git a/urwid/canvas.py b/urwid/canvas.py
index 3c96bbe..479e889 100644
--- a/urwid/canvas.py
+++ b/urwid/canvas.py
@@ -26,7 +26,6 @@ import weakref
 from urwid.util import rle_len, rle_append_modify, rle_join_modify, rle_product, \
     calc_width, calc_text_pos, apply_target_encoding, trim_text_attr_cs
 from urwid.text_layout import trim_line, LayoutSegment
-from urwid.compat import bytes
 
 
 class CanvasCache(object):
diff --git a/urwid/compat.py b/urwid/compat.py
index 4dde62f..5734552 100644
--- a/urwid/compat.py
+++ b/urwid/compat.py
@@ -24,10 +24,6 @@ from __future__ import division, print_function
 
 import sys
 
-try: # python 2.4 and 2.5 compat
-    bytes = bytes
-except NameError:
-    bytes = str
 
 PYTHON3 = sys.version_info > (3, 0)
 
diff --git a/urwid/curses_display.py b/urwid/curses_display.py
index 29048e6..c37507c 100755
--- a/urwid/curses_display.py
+++ b/urwid/curses_display.py
@@ -32,7 +32,7 @@ from urwid import escape
 
 from urwid.display_common import BaseScreen, RealTerminal, AttrSpec, \
     UNPRINTABLE_TRANS_TABLE
-from urwid.compat import bytes, PYTHON3, text_type, xrange, ord2
+from urwid.compat import PYTHON3, text_type, xrange, ord2
 
 KEY_RESIZE = 410 # curses.KEY_RESIZE (sometimes not defined)
 KEY_MOUSE = 409 # curses.KEY_MOUSE
diff --git a/urwid/escape.py b/urwid/escape.py
index 263528a..6992834 100644
--- a/urwid/escape.py
+++ b/urwid/escape.py
@@ -33,7 +33,7 @@ try:
 except ImportError:
     from urwid import old_str_util as str_util
 
-from urwid.compat import bytes, bytes3
+from urwid.compat import bytes3
 
 # NOTE: because of circular imports (urwid.util -> urwid.escape -> urwid.util)
 # from urwid.util import is_mouse_event -- will not work here
diff --git a/urwid/old_str_util.py b/urwid/old_str_util.py
index 2c6d1e0..4d3461d 100755
--- a/urwid/old_str_util.py
+++ b/urwid/old_str_util.py
@@ -24,7 +24,7 @@ from __future__ import division, print_function
 
 import re
 
-from urwid.compat import bytes, B, ord2, text_type
+from urwid.compat import B, ord2, text_type
 
 SAFE_ASCII_RE = re.compile(u"^[ -~]*$")
 SAFE_ASCII_BYTES_RE = re.compile(B("^[ -~]*$"))
diff --git a/urwid/raw_display.py b/urwid/raw_display.py
index 087d30e..1dedb03 100644
--- a/urwid/raw_display.py
+++ b/urwid/raw_display.py
@@ -44,7 +44,7 @@ from urwid.display_common import BaseScreen, RealTerminal, \
     UPDATE_PALETTE_ENTRY, AttrSpec, UNPRINTABLE_TRANS_TABLE, \
     INPUT_DESCRIPTORS_CHANGED
 from urwid import signals
-from urwid.compat import PYTHON3, bytes, B
+from urwid.compat import PYTHON3, B
 
 from subprocess import Popen, PIPE
 
diff --git a/urwid/split_repr.py b/urwid/split_repr.py
index 42d4b31..5edf4c9 100755
--- a/urwid/split_repr.py
+++ b/urwid/split_repr.py
@@ -21,7 +21,7 @@
 
 from __future__ import division, print_function
 
-from urwid.compat import PYTHON3, bytes
+from urwid.compat import PYTHON3
 if not PYTHON3:
     from inspect import getargspec
 else:
diff --git a/urwid/text_layout.py b/urwid/text_layout.py
index c3a2618..a1c64f4 100644
--- a/urwid/text_layout.py
+++ b/urwid/text_layout.py
@@ -24,7 +24,7 @@ from __future__ import division, print_function
 
 from urwid.util import calc_width, calc_text_pos, calc_trim_text, is_wide_char, \
     move_prev_char, move_next_char
-from urwid.compat import bytes, PYTHON3, B, xrange
+from urwid.compat import PYTHON3, B, xrange
 
 class TextLayout:
     def supports_align_mode(self, align):
diff --git a/urwid/util.py b/urwid/util.py
index acd62f6..2e8e0d4 100644
--- a/urwid/util.py
+++ b/urwid/util.py
@@ -23,7 +23,7 @@
 from __future__ import division, print_function
 
 from urwid import escape
-from urwid.compat import bytes, text_type, text_types
+from urwid.compat import text_type, text_types
 
 import codecs
 
@@ -118,13 +118,7 @@ def apply_target_encoding( s ):
     """
     if _use_dec_special and type(s) == text_type:
         # first convert drawing characters
-        try:
-            s = s.translate( escape.DEC_SPECIAL_CHARMAP )
-        except NotImplementedError:
-            # python < 2.4 needs to do this the hard way..
-            for c, alt in zip(escape.DEC_SPECIAL_CHARS,
-                    escape.ALT_DEC_SPECIAL_CHARS):
-                s = s.replace( c, escape.SO+alt+escape.SI )
+        s = s.translate(escape.DEC_SPECIAL_CHARMAP)
 
     if type(s) == text_type:
         s = s.replace(escape.SI+escape.SO, u"") # remove redundant shifts
diff --git a/urwid/vterm.py b/urwid/vterm.py
index ab23078..761a602 100644
--- a/urwid/vterm.py
+++ b/urwid/vterm.py
@@ -45,7 +45,7 @@ from urwid.escape import DEC_SPECIAL_CHARS, ALT_DEC_SPECIAL_CHARS
 from urwid.canvas import Canvas
 from urwid.widget import Widget, BOX
 from urwid.display_common import AttrSpec, RealTerminal, _BASIC_COLORS
-from urwid.compat import ord2, chr2, B, bytes, PYTHON3, xrange
+from urwid.compat import ord2, chr2, B, PYTHON3, xrange
 
 EOF = B('')
 ESC = chr(27)