*: Use default argument for str.encode()

I had missed that this became hard-coded to utf-8 in py3k,
instead of being overridable as in python 2.

Automated change with modified pyupgrade.

diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py
index 3115a19409fe61dd3523d0e7b134cf41512eaff6..b9614dcb7a8d248f75558001df21cb9462fe396e 100644 (file)
--- a/tornado/test/escape_test.py
+++ b/tornado/test/escape_test.py
@@ -247,7 +247,7 @@ class EscapeTestCase(unittest.TestCase):
     def test_url_escape_unicode(self):
         tests = [
             # byte strings are passed through as-is
-            ("\u00e9".encode("utf8"), "%C3%A9"),
+            ("\u00e9".encode(), "%C3%A9"),
             ("\u00e9".encode("latin1"), "%E9"),
             # unicode strings become utf8
             ("\u00e9", "%C3%A9"),

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index 07244634afd5ca6ebc3de0d4b6cad8f154eeb8f7..857554055a80323d9d4537192839c1b95f25cf6f 100644 (file)
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -282,13 +282,11 @@ class HTTPConnectionTest(AsyncHTTPTestCase):
                 [
                     b"Content-Disposition: form-data; name=argument",
                     b"",
-                    "\u00e1".encode("utf-8"),
+                    "\u00e1".encode(),
                     b"--1234567890",
-                    'Content-Disposition: form-data; name="files"; filename="\u00f3"'.encode(
-                        "utf8"
-                    ),
+                    'Content-Disposition: form-data; name="files"; filename="\u00f3"'.encode(),
                     b"",
-                    "\u00fa".encode("utf-8"),
+                    "\u00fa".encode(),
                     b"--1234567890--",
                     b"",
                 ]

diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py
index fec4c389e21465f15fe417b6953a60d984064704..5b4f9918a1ab8d96480d90f81164be65c9ede436 100644 (file)
--- a/tornado/test/log_test.py
+++ b/tornado/test/log_test.py
@@ -89,7 +89,7 @@ class LogFormatterTest(unittest.TestCase):
 
     def test_utf8_logging(self):
         with ignore_bytes_warning():
-            self.logger.error("\u00e9".encode("utf8"))
+            self.logger.error("\u00e9".encode())
         if issubclass(bytes, basestring_type):
             # on python 2, utf8 byte strings (and by extension ascii byte
             # strings) are passed through as-is.