From: laggardkernel <laggardkernel@gmail.com>
Date: Wed, 8 Dec 2021 10:55:39 +0000 (+0800)
Subject: Cleanup py2 import code in demo
X-Git-Tag: v6.2.0b1~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3086%2Fhead;p=thirdparty%2Ftornado.git

Cleanup py2 import code in demo
---

diff --git a/demos/file_upload/file_receiver.py b/demos/file_upload/file_receiver.py
index 53489704c..4f8e721e7 100755
--- a/demos/file_upload/file_receiver.py
+++ b/demos/file_upload/file_receiver.py
@@ -9,12 +9,7 @@ See file_uploader.py in this directory for code that uploads files in this forma
 """
 
 import logging
-
-try:
-    from urllib.parse import unquote
-except ImportError:
-    # Python 2.
-    from urllib import unquote
+from urllib.parse import unquote
 
 import tornado.ioloop
 import tornado.web
diff --git a/demos/file_upload/file_uploader.py b/demos/file_upload/file_uploader.py
index f48991407..c63ec1891 100755
--- a/demos/file_upload/file_uploader.py
+++ b/demos/file_upload/file_uploader.py
@@ -13,14 +13,9 @@ import mimetypes
 import os
 import sys
 from functools import partial
+from urllib.parse import quote
 from uuid import uuid4
 
-try:
-    from urllib.parse import quote
-except ImportError:
-    # Python 2.
-    from urllib import quote
-
 from tornado import gen, httpclient, ioloop
 from tornado.options import define, options