Replace unicode literals

Author: sebastinas

curtsies/configfile_keynames.py

@@ -5,9 +5,9 @@
 from typing import Tuple
 
 SPECIALS = {
-    "C-[": u"<ESC>",
-    "C-^": u"<Ctrl-6>",
-    "C-_": u"<Ctrl-/>",
+    "C-[": "<ESC>",
+    "C-^": "<Ctrl-6>",
+    "C-_": "<Ctrl-/>",
 }
 
 # TODO make a precalculated version of this
@@ -21,14 +21,14 @@ def __getitem__(self, key):
         elif key in SPECIALS:
             return (SPECIALS[key],)
         elif key[1:] and key[:2] == "C-":
-            return (u"<Ctrl-%s>" % key[2:],)
+            return ("<Ctrl-%s>" % key[2:],)
         elif key[1:] and key[:2] == "M-":
             return (
-                u"<Esc+%s>" % key[2:],
-                u"<Meta-%s>" % key[2:],
+                "<Esc+%s>" % key[2:],
+                "<Meta-%s>" % key[2:],
             )
         elif key[0] == "F" and key[1:].isdigit():
-            return (u"<F%d>" % int(key[1:]),)
+            return ("<F%d>" % int(key[1:]),)
         else:
             raise KeyError(
                 "Configured keymap (%s)" % key + " does not exist in bpython.keys"

curtsies/curtsieskeys.py

@@ -9,129 +9,129 @@
 
 # fmt: off
 CURTSIES_NAMES = dict([
-  (b' ',          u'<SPACE>'),
-  (b'\x1b ',      u'<Esc+SPACE>'),
-  (b'\t',         u'<TAB>'),
-  (b'\x1b[Z',     u'<Shift-TAB>'),
-  (b'\x1b[A',     u'<UP>'),
-  (b'\x1b[B',     u'<DOWN>'),
-  (b'\x1b[C',     u'<RIGHT>'),
-  (b'\x1b[D',     u'<LEFT>'),
-  (b'\x1bOA',     u'<UP>'),         # in issue 92 its shown these should be normal arrows,
-  (b'\x1bOB',     u'<DOWN>'),       # not ctrl-arrows as we previously had them.
-  (b'\x1bOC',     u'<RIGHT>'),
-  (b'\x1bOD',     u'<LEFT>'),
-
-  (b'\x1b[1;5A',  u'<Ctrl-UP>'),
-  (b'\x1b[1;5B',  u'<Ctrl-DOWN>'),
-  (b'\x1b[1;5C',  u'<Ctrl-RIGHT>'), # reported by myint
-  (b'\x1b[1;5D',  u'<Ctrl-LEFT>'),  # reported by myint
-
-  (b'\x1b[5A',    u'<Ctrl-UP>'),    # not sure about these, someone wanted them for bpython
-  (b'\x1b[5B',    u'<Ctrl-DOWN>'),
-  (b'\x1b[5C',    u'<Ctrl-RIGHT>'),
-  (b'\x1b[5D',    u'<Ctrl-LEFT>'),
-
-  (b'\x1b[1;9A',  u'<Esc+UP>'),
-  (b'\x1b[1;9B',  u'<Esc+DOWN>'),
-  (b'\x1b[1;9C',  u'<Esc+RIGHT>'),
-  (b'\x1b[1;9D',  u'<Esc+LEFT>'),
-
-  (b'\x1b[1;10A', u'<Esc+Shift-UP>'),
-  (b'\x1b[1;10B', u'<Esc+Shift-DOWN>'),
-  (b'\x1b[1;10C', u'<Esc+Shift-RIGHT>'),
-  (b'\x1b[1;10D', u'<Esc+Shift-LEFT>'),
-
-  (b'\x1bOP',     u'<F1>'),
-  (b'\x1bOQ',     u'<F2>'),
-  (b'\x1bOR',     u'<F3>'),
-  (b'\x1bOS',     u'<F4>'),
+  (b' ',          '<SPACE>'),
+  (b'\x1b ',      '<Esc+SPACE>'),
+  (b'\t',         '<TAB>'),
+  (b'\x1b[Z',     '<Shift-TAB>'),
+  (b'\x1b[A',     '<UP>'),
+  (b'\x1b[B',     '<DOWN>'),
+  (b'\x1b[C',     '<RIGHT>'),
+  (b'\x1b[D',     '<LEFT>'),
+  (b'\x1bOA',     '<UP>'),         # in issue 92 its shown these should be normal arrows,
+  (b'\x1bOB',     '<DOWN>'),       # not ctrl-arrows as we previously had them.
+  (b'\x1bOC',     '<RIGHT>'),
+  (b'\x1bOD',     '<LEFT>'),
+
+  (b'\x1b[1;5A',  '<Ctrl-UP>'),
+  (b'\x1b[1;5B',  '<Ctrl-DOWN>'),
+  (b'\x1b[1;5C',  '<Ctrl-RIGHT>'), # reported by myint
+  (b'\x1b[1;5D',  '<Ctrl-LEFT>'),  # reported by myint
+
+  (b'\x1b[5A',    '<Ctrl-UP>'),    # not sure about these, someone wanted them for bpython
+  (b'\x1b[5B',    '<Ctrl-DOWN>'),
+  (b'\x1b[5C',    '<Ctrl-RIGHT>'),
+  (b'\x1b[5D',    '<Ctrl-LEFT>'),
+
+  (b'\x1b[1;9A',  '<Esc+UP>'),
+  (b'\x1b[1;9B',  '<Esc+DOWN>'),
+  (b'\x1b[1;9C',  '<Esc+RIGHT>'),
+  (b'\x1b[1;9D',  '<Esc+LEFT>'),
+
+  (b'\x1b[1;10A', '<Esc+Shift-UP>'),
+  (b'\x1b[1;10B', '<Esc+Shift-DOWN>'),
+  (b'\x1b[1;10C', '<Esc+Shift-RIGHT>'),
+  (b'\x1b[1;10D', '<Esc+Shift-LEFT>'),
+
+  (b'\x1bOP',     '<F1>'),
+  (b'\x1bOQ',     '<F2>'),
+  (b'\x1bOR',     '<F3>'),
+  (b'\x1bOS',     '<F4>'),
 
   # see bpython #626
-  (b'\x1b[11~',   u'<F1>'),
-  (b'\x1b[12~',   u'<F2>'),
-  (b'\x1b[13~',   u'<F3>'),
-  (b'\x1b[14~',   u'<F4>'),
-
-  (b'\x1b[15~',   u'<F5>'),
-  (b'\x1b[17~',   u'<F6>'),
-  (b'\x1b[18~',   u'<F7>'),
-  (b'\x1b[19~',   u'<F8>'),
-  (b'\x1b[20~',   u'<F9>'),
-  (b'\x1b[21~',   u'<F10>'),
-  (b'\x1b[23~',   u'<F11>'),
-  (b'\x1b[24~',   u'<F12>'),
-  (b'\x00',       u'<Ctrl-SPACE>'),
-  (b'\x1c',       u'<Ctrl-\\>'),
-  (b'\x1d',       u'<Ctrl-]>'),
-  (b'\x1e',       u'<Ctrl-6>'),
-  (b'\x1f',       u'<Ctrl-/>'),
-  (b'\x7f',       u'<BACKSPACE>'),    # for some folks this is ctrl-backspace apparently
-  (b'\x1b\x7f',   u'<Esc+BACKSPACE>'),
-  (b'\xff',       u'<Meta-BACKSPACE>'),
-  (b'\x1b\x1b[A', u'<Esc+UP>'),    # uncertain about these four
-  (b'\x1b\x1b[B', u'<Esc+DOWN>'),
-  (b'\x1b\x1b[C', u'<Esc+RIGHT>'),
-  (b'\x1b\x1b[D', u'<Esc+LEFT>'),
-  (b'\x1b',       u'<ESC>'),
-  (b'\x1b[1~',    u'<HOME>'),
-  (b'\x1b[4~',    u'<END>'),
-  (b'\x1b\x1b[5~',u'<Esc+PAGEUP>'),
-  (b'\x1b\x1b[6~',u'<Esc+PAGEDOWN>'),
-
-  (b'\x1b[H',     u'<HOME>'),    # reported by amorozov in bpython #490
-  (b'\x1b[F',     u'<END>'),     # reported by amorozov in bpython #490
-
-  (b'\x1bOH',     u'<HOME>'),    # reported by mixmastamyk in curtsies #78
-  (b'\x1bOF',     u'<END>'),     # reported by mixmastamyk in curtsies #78
+  (b'\x1b[11~',   '<F1>'),
+  (b'\x1b[12~',   '<F2>'),
+  (b'\x1b[13~',   '<F3>'),
+  (b'\x1b[14~',   '<F4>'),
+
+  (b'\x1b[15~',   '<F5>'),
+  (b'\x1b[17~',   '<F6>'),
+  (b'\x1b[18~',   '<F7>'),
+  (b'\x1b[19~',   '<F8>'),
+  (b'\x1b[20~',   '<F9>'),
+  (b'\x1b[21~',   '<F10>'),
+  (b'\x1b[23~',   '<F11>'),
+  (b'\x1b[24~',   '<F12>'),
+  (b'\x00',       '<Ctrl-SPACE>'),
+  (b'\x1c',       '<Ctrl-\\>'),
+  (b'\x1d',       '<Ctrl-]>'),
+  (b'\x1e',       '<Ctrl-6>'),
+  (b'\x1f',       '<Ctrl-/>'),
+  (b'\x7f',       '<BACKSPACE>'),    # for some folks this is ctrl-backspace apparently
+  (b'\x1b\x7f',   '<Esc+BACKSPACE>'),
+  (b'\xff',       '<Meta-BACKSPACE>'),
+  (b'\x1b\x1b[A', '<Esc+UP>'),    # uncertain about these four
+  (b'\x1b\x1b[B', '<Esc+DOWN>'),
+  (b'\x1b\x1b[C', '<Esc+RIGHT>'),
+  (b'\x1b\x1b[D', '<Esc+LEFT>'),
+  (b'\x1b',       '<ESC>'),
+  (b'\x1b[1~',    '<HOME>'),
+  (b'\x1b[4~',    '<END>'),
+  (b'\x1b\x1b[5~','<Esc+PAGEUP>'),
+  (b'\x1b\x1b[6~','<Esc+PAGEDOWN>'),
+
+  (b'\x1b[H',     '<HOME>'),    # reported by amorozov in bpython #490
+  (b'\x1b[F',     '<END>'),     # reported by amorozov in bpython #490
+
+  (b'\x1bOH',     '<HOME>'),    # reported by mixmastamyk in curtsies #78
+  (b'\x1bOF',     '<END>'),     # reported by mixmastamyk in curtsies #78
 
   # not fixing for back compat.
   # (b"\x1b[1~", u'<FIND>'),       # find
 
-  (b"\x1b[2~", u'<INSERT>'),       # insert (0)
-  (b"\x1b[3~", u'<DELETE>'),       # delete (.), "Execute"
-  (b"\x1b[3;5~", u'<Ctrl-DELETE>'),
+  (b"\x1b[2~", '<INSERT>'),       # insert (0)
+  (b"\x1b[3~", '<DELETE>'),       # delete (.), "Execute"
+  (b"\x1b[3;5~", '<Ctrl-DELETE>'),
 
   # not fixing for back compat.
   # (b"\x1b[4~", u'<SELECT>'),       # select
 
-  (b"\x1b[5~", u'<PAGEUP>'),       # pgup   (9)
-  (b"\x1b[6~", u'<PAGEDOWN>'),     # pgdown (3)
-  (b"\x1b[7~", u'<HOME>'),         # home
-  (b"\x1b[8~", u'<END>'),          # end
-  (b"\x1b[OA", u'<UP>'),           # up     (8)
-  (b"\x1b[OB", u'<DOWN>'),         # down   (2)
-  (b"\x1b[OC", u'<RIGHT>'),        # right  (6)
-  (b"\x1b[OD", u'<LEFT>'),         # left   (4)
-  (b"\x1b[OF", u'<END>'),          # end    (1)
-  (b"\x1b[OH", u'<HOME>'),         # home   (7)
+  (b"\x1b[5~", '<PAGEUP>'),       # pgup   (9)
+  (b"\x1b[6~", '<PAGEDOWN>'),     # pgdown (3)
+  (b"\x1b[7~", '<HOME>'),         # home
+  (b"\x1b[8~", '<END>'),          # end
+  (b"\x1b[OA", '<UP>'),           # up     (8)
+  (b"\x1b[OB", '<DOWN>'),         # down   (2)
+  (b"\x1b[OC", '<RIGHT>'),        # right  (6)
+  (b"\x1b[OD", '<LEFT>'),         # left   (4)
+  (b"\x1b[OF", '<END>'),          # end    (1)
+  (b"\x1b[OH", '<HOME>'),         # home   (7)
 
   # reported by cool-RR
-  (b"\x1b[[A", u'<F1>'),
-  (b"\x1b[[B", u'<F2>'),
-  (b"\x1b[[C", u'<F3>'),
-  (b"\x1b[[D", u'<F4>'),
-  (b"\x1b[[E", u'<F5>'),
+  (b"\x1b[[A", '<F1>'),
+  (b"\x1b[[B", '<F2>'),
+  (b"\x1b[[C", '<F3>'),
+  (b"\x1b[[D", '<F4>'),
+  (b"\x1b[[E", '<F5>'),
   # cool-RR says the rest were good, see issue #99
 
   #reported by alethiophile see issue #119
-  (b"\x1b[1;3C", u'<Meta-RIGHT>'),      #alt-right
-  (b"\x1b[1;3B", u'<Meta-DOWN>'),       #alt-down
-  (b"\x1b[1;3D", u'<Meta-LEFT>'),       #alt-left
-  (b"\x1b[1;3A", u'<Meta-UP>'),         #alt-up
-  (b"\x1b[5;3~", u'<Meta-PAGEUP>'),     #alt-pageup
-  (b"\x1b[6;3~", u'<Meta-PAGEDOWN>'),   #alt-pagedown
-  (b"\x1b[1;3H", u'<Meta-HOME>'),       #alt-home
-  (b"\x1b[1;3F", u'<Meta-END>'),        #alt-end
-  (b"\x1b[1;2C", u'<Shift-RIGHT>'),
-  (b"\x1b[1;2B", u'<Shift-RIGHT>'),
-  (b"\x1b[1;2D", u'<Shift-RIGHT>'),
-  (b"\x1b[1;2A", u'<Shift-RIGHT>'),
-  (b"\x1b[3;2~", u'<Shift-DELETE>'),
-  (b"\x1b[5;2~", u'<Shift-PAGEUP>'),
-  (b"\x1b[6;2~", u'<Shift-PAGEDOWN>'),
-  (b"\x1b[1;2H", u'<Shift-HOME>'),
-  (b"\x1b[1;2F", u'<Shift-END>'),
+  (b"\x1b[1;3C", '<Meta-RIGHT>'),      #alt-right
+  (b"\x1b[1;3B", '<Meta-DOWN>'),       #alt-down
+  (b"\x1b[1;3D", '<Meta-LEFT>'),       #alt-left
+  (b"\x1b[1;3A", '<Meta-UP>'),         #alt-up
+  (b"\x1b[5;3~", '<Meta-PAGEUP>'),     #alt-pageup
+  (b"\x1b[6;3~", '<Meta-PAGEDOWN>'),   #alt-pagedown
+  (b"\x1b[1;3H", '<Meta-HOME>'),       #alt-home
+  (b"\x1b[1;3F", '<Meta-END>'),        #alt-end
+  (b"\x1b[1;2C", '<Shift-RIGHT>'),
+  (b"\x1b[1;2B", '<Shift-RIGHT>'),
+  (b"\x1b[1;2D", '<Shift-RIGHT>'),
+  (b"\x1b[1;2A", '<Shift-RIGHT>'),
+  (b"\x1b[3;2~", '<Shift-DELETE>'),
+  (b"\x1b[5;2~", '<Shift-PAGEUP>'),
+  (b"\x1b[6;2~", '<Shift-PAGEDOWN>'),
+  (b"\x1b[1;2H", '<Shift-HOME>'),
+  (b"\x1b[1;2F", '<Shift-END>'),
   #end of keys reported by alethiophile
 
 ])

curtsies/escseqparse.py

@@ -144,7 +144,7 @@ def token_type(info):
             if value in FG_NUMBER_TO_COLOR: tokens.append({'fg':FG_NUMBER_TO_COLOR[value]})
             if value in BG_NUMBER_TO_COLOR: tokens.append({'bg':BG_NUMBER_TO_COLOR[value]})
             if value in NUMBER_TO_STYLE: tokens.append({NUMBER_TO_STYLE[value]:True})
-            if value == RESET_ALL: tokens.append(dict(dict((k, None) for k in STYLES), **{'fg':None, 'bg':None}))
+            if value == RESET_ALL: tokens.append(dict({k: None for k in STYLES}, **{'fg':None, 'bg':None}))
             if value == RESET_FG: tokens.append({'fg':None})
             if value == RESET_BG: tokens.append({'bg':None})
         # fmt: on
@@ -164,4 +164,4 @@ def token_type(info):
     doctest.testmod()
     # print(peel_off_esc_code('stuff'))
     # print(peel_off_esc_code('Amore'))
-    print((repr(parse("[31mstuff is the best[32myay"))))
+    print(repr(parse("[31mstuff is the best[32myay")))