Subliminal update

libs/requests/compat.py

@@ -72,6 +72,10 @@ is_osx = ('darwin' in str(sys.platform).lower())
 is_hpux = ('hpux' in str(sys.platform).lower())   # Complete guess.
 is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
 
+try:
+    import simplejson as json
+except ImportError:
+    import json
 
 # ---------
 # Specifics
@@ -85,10 +89,17 @@ if is_py2:
     import cookielib
     from Cookie import Morsel
     from StringIO import StringIO
+    try:
+        import cchardet as chardet
+    except ImportError:
+        from .packages import chardet
+    from .packages.urllib3.packages.ordered_dict import OrderedDict
 
+    builtin_str = str
     bytes = str
     str = unicode
     basestring = basestring
+    numeric_types = (int, long, float)
 
 
 
@@ -98,8 +109,11 @@ elif is_py3:
     from http import cookiejar as cookielib
     from http.cookies import Morsel
     from io import StringIO
+    from .packages import chardet2 as chardet
+    from collections import OrderedDict
 
+    builtin_str = str
     str = str
     bytes = bytes
     basestring = (str,bytes)
-
+    numeric_types = (int, float)