Replace unicode literals

sebastinas · sebastinas · commit ea9ac3319e1d · 2020-10-13T21:23:52.000+02:00
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -121,14 +121,14 @@ def parsekeywordpairs(signature):
     parendepth = 0
     for token, value in tokens:
         if preamble:
-            if token is Token.Punctuation and value == u"(":
+            if token is Token.Punctuation and value == "(":
                 preamble = False
             continue
 
         if token is Token.Punctuation:
-            if value in [u"(", u"{", u"["]:
+            if value in ["(", "{", "["]:
                 parendepth += 1
-            elif value in [u")", u"}", u"]"]:
+            elif value in [")", "}", "]"]:
                 parendepth -= 1
             elif value == ":" and parendepth == -1:
                 # End of signature reached
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -470,7 +470,7 @@ def ps2(self):
         try:
             return sys.ps2
         except AttributeError:
-            return u"... "
+            return "... "
 
     def startup(self):
         """
@@ -659,11 +659,11 @@ def get_source_of_current_name(self):
                     obj = self.get_object(line)
             return inspection.get_source_unicode(obj)
         except (AttributeError, NameError) as e:
-            msg = _(u"Cannot get source: %s") % (e,)
+            msg = _("Cannot get source: %s") % (e,)
         except IOError as e:
-            msg = u"%s" % (e,)
+            msg = f"{e}"
         except TypeError as e:
-            if "built-in" in u"%s" % (e,):
+            if "built-in" in f"{e}":
                 msg = _("Cannot access source of %r") % (obj,)
             else:
                 msg = _("No source code found for %s") % (self.current_line,)
@@ -946,7 +946,7 @@ def insert_into_history(self, s):
                 s, pythonhist, getpreferredencoding()
             )
         except RuntimeError as e:
-            self.interact.notify(u"%s" % (e,))
+            self.interact.notify(f"{e}")
 
     def prompt_undo(self):
         """Returns how many lines to undo, 0 means don't undo"""
diff --git a/bpython/test/test_curtsies_coderunner.py b/bpython/test/test_curtsies_coderunner.py
@@ -46,7 +46,7 @@ def ctrlc():
 
 class TestFakeOutput(unittest.TestCase):
     def assert_unicode(self, s):
-        self.assertIsInstance(s, type(u""))
+        self.assertIsInstance(s, type(""))
 
     def test_bytes(self):
         out = FakeOutput(mock.Mock(), self.assert_unicode, None)
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -7,12 +7,12 @@
 from bpython.test.fodder import encoding_utf8
 
 
-foo_ascii_only = u'''def foo():
+foo_ascii_only = '''def foo():
     """Test"""
     pass
 '''
 
-foo_non_ascii = u'''def foo():
+foo_non_ascii = '''def foo():
     """Test &auml;&ouml;&uuml;"""
     pass
 '''
