Upgraded Bottle.py to 0.10.11 and CherryPy to 3.2.2.

python/packages/cherrypy/_cpcompat.py

@@ -16,9 +16,11 @@ It also provides a 'base64_decode' function with native strings as input and
 output.
 """
 import os
+import re
 import sys
 
 if sys.version_info >= (3, 0):
+    py3k = True
     bytestr = bytes
     unicodestr = str
     nativestr = unicodestr
@@ -31,12 +33,19 @@ if sys.version_info >= (3, 0):
         """Return the given native string as a unicode string with the given encoding."""
         # In Python 3, the native string type is unicode
         return n
+    def tonative(n, encoding='ISO-8859-1'):
+        """Return the given string as a native string in the given encoding."""
+        # In Python 3, the native string type is unicode
+        if isinstance(n, bytes):
+            return n.decode(encoding)
+        return n
     # type("")
     from io import StringIO
     # bytes:
     from io import BytesIO as BytesIO
 else:
     # Python 2
+    py3k = False
     bytestr = str
     unicodestr = unicode
     nativestr = bytestr
@@ -49,10 +58,25 @@ else:
         return n
     def ntou(n, encoding='ISO-8859-1'):
         """Return the given native string as a unicode string with the given encoding."""
-        # In Python 2, the native string type is bytes. Assume it's already
-        # in the given encoding, which for ISO-8859-1 is almost always what
-        # was intended.
+        # In Python 2, the native string type is bytes.
+        # First, check for the special encoding 'escape'. The test suite uses this
+        # to signal that it wants to pass a string with embedded \uXXXX escapes,
+        # but without having to prefix it with u'' for Python 2, but no prefix
+        # for Python 3.
+        if encoding == 'escape':
+            return unicode(
+                re.sub(r'\\u([0-9a-zA-Z]{4})',
+                       lambda m: unichr(int(m.group(1), 16)),
+                       n.decode('ISO-8859-1')))
+        # Assume it's already in the given encoding, which for ISO-8859-1 is almost
+        # always what was intended.
         return n.decode(encoding)
+    def tonative(n, encoding='ISO-8859-1'):
+        """Return the given string as a native string in the given encoding."""
+        # In Python 2, the native string type is bytes.
+        if isinstance(n, unicode):
+            return n.encode(encoding)
+        return n
     try:
         # type("")
         from cStringIO import StringIO
@@ -185,6 +209,18 @@ except ImportError:
     from http.client import BadStatusLine, HTTPConnection, HTTPSConnection, IncompleteRead, NotConnected
     from http.server import BaseHTTPRequestHandler
 
+try:
+    # Python 2. We have to do it in this order so Python 2 builds
+    # don't try to import the 'http' module from cherrypy.lib
+    from httplib import HTTPSConnection
+except ImportError:
+    try:
+        # Python 3
+        from http.client import HTTPSConnection
+    except ImportError:
+        # Some platforms which don't have SSL don't expose HTTPSConnection
+        HTTPSConnection = None
+
 try:
     # Python 2
     xrange = xrange
@@ -229,7 +265,7 @@ try:
     json_decode = json.JSONDecoder().decode
     json_encode = json.JSONEncoder().iterencode
 except ImportError:
-    if sys.version_info >= (3, 0):
+    if py3k:
         # Python 3.0: json is part of the standard library,
         # but outputs unicode. We need bytes.
         import json
@@ -280,4 +316,3 @@ except NameError:
     # Python 2
     def next(i):
         return i.next()
-