fix: Workaround for a bug in some versions of lib2to3 (fix #175)

1 files changed, 6 insertions, 1 deletions

diff --git a/bottle.py b/bottle.py
index 8f6e7b6..04472b1 100755
--- a/bottle.py
+++ b/bottle.py
@@ -40,9 +40,14 @@ import warnings
 from Cookie import SimpleCookie
 from tempfile import TemporaryFile
 from traceback import format_exc
-from urllib import urlencode, quote as urlquote, unquote as urlunquote
 from urlparse import urlunsplit, urljoin, SplitResult as UrlSplitResult
 
+# Workaround for a bug in some versions of lib2to3 (fixed on CPython 2.7 and 3.2)
+import urllib
+urlencode = urllib.urlencode
+urlquote = urllib.quote
+urlunquote = urllib.unquote
+
 try: from collections import MutableMapping as DictMixin
 except ImportError: # pragma: no cover
     from UserDict import DictMixin