diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2016-06-04 22:55:21 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2016-06-04 22:55:21 +0200 |
commit | c93b4eacebe62e3993da790cbea8fbf62e161f07 (patch) | |
tree | 1b6a356fa6d0fa38f76a466012fc630096f94f9b /devscripts/buildserver.py | |
parent | 71b9cb3107e156c7f17ec4cdf1d09421cb4dd4b1 (diff) | |
parent | 633b444fd29aa9d8b3ba722285ae2475ae66595f (diff) |
git pushMerge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'devscripts/buildserver.py')
-rw-r--r-- | devscripts/buildserver.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py index f7979c43e..fc99c3213 100644 --- a/devscripts/buildserver.py +++ b/devscripts/buildserver.py @@ -13,6 +13,7 @@ import os.path sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__))))) from youtube_dl.compat import ( + compat_input, compat_http_server, compat_str, compat_urlparse, @@ -30,11 +31,6 @@ try: except ImportError: # Python 2 import SocketServer as compat_socketserver -try: - compat_input = raw_input -except NameError: # Python 3 - compat_input = input - class BuildHTTPServer(compat_socketserver.ThreadingMixIn, compat_http_server.HTTPServer): allow_reuse_address = True |