From bda1306749c62ef4f11cfe567ed7d56c8ad94240 Mon Sep 17 00:00:00 2001
From: Michael Merickel <github@m.merickel.org>
Date: Mon, 15 Oct 2018 16:56:42 +0200
Subject: [PATCH] Merge pull request #3388 from mmerickel/black
---
src/pyramid/compat.py | 65 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/src/pyramid/compat.py b/src/pyramid/compat.py
index a7f9c12..31832c8 100644
--- a/src/pyramid/compat.py
+++ b/src/pyramid/compat.py
@@ -7,8 +7,9 @@
try: # pragma: no cover
import __pypy__
+
PYPY = True
-except: # pragma: no cover
+except BaseException: # pragma: no cover
__pypy__ = None
PYPY = False
@@ -27,19 +28,20 @@
PY3 = sys.version_info[0] == 3
if PY2:
- string_types = basestring,
+ string_types = (basestring,)
integer_types = (int, long)
class_types = (type, types.ClassType)
text_type = unicode
binary_type = str
long = long
else:
- string_types = str,
- integer_types = int,
- class_types = type,
+ string_types = (str,)
+ integer_types = (int,)
+ class_types = (type,)
text_type = str
binary_type = bytes
long = int
+
def text_(s, encoding='latin-1', errors='strict'):
""" If ``s`` is an instance of ``binary_type``, return
@@ -48,6 +50,7 @@
return s.decode(encoding, errors)
return s
+
def bytes_(s, encoding='latin-1', errors='strict'):
""" If ``s`` is an instance of ``text_type``, return
``s.encode(encoding, errors)``, otherwise return ``s``"""
@@ -55,16 +58,22 @@
return s.encode(encoding, errors)
return s
+
if PY2:
+
def ascii_native_(s):
if isinstance(s, text_type):
s = s.encode('ascii')
return str(s)
+
+
else:
+
def ascii_native_(s):
if isinstance(s, text_type):
s = s.encode('ascii')
return str(s, 'ascii', 'strict')
+
ascii_native_.__doc__ = """
Python 3: If ``s`` is an instance of ``text_type``, return
@@ -76,19 +85,24 @@
if PY2:
+
def native_(s, encoding='latin-1', errors='strict'):
""" If ``s`` is an instance of ``text_type``, return
``s.encode(encoding, errors)``, otherwise return ``str(s)``"""
if isinstance(s, text_type):
return s.encode(encoding, errors)
return str(s)
+
+
else:
+
def native_(s, encoding='latin-1', errors='strict'):
""" If ``s`` is an instance of ``text_type``, return
``s``, otherwise return ``str(s, encoding, errors)``"""
if isinstance(s, text_type):
return s
return str(s, encoding, errors)
+
native_.__doc__ = """
Python 3: If ``s`` is an instance of ``text_type``, return ``s``, otherwise
@@ -106,25 +120,34 @@
from urllib import urlencode as url_encode
from urllib2 import urlopen as url_open
- def url_unquote_text(v, encoding='utf-8', errors='replace'): # pragma: no cover
+ def url_unquote_text(
+ v, encoding='utf-8', errors='replace'
+ ): # pragma: no cover
v = url_unquote(v)
return v.decode(encoding, errors)
- def url_unquote_native(v, encoding='utf-8', errors='replace'): # pragma: no cover
+ def url_unquote_native(
+ v, encoding='utf-8', errors='replace'
+ ): # pragma: no cover
return native_(url_unquote_text(v, encoding, errors))
+
+
else:
from urllib import parse
+
urlparse = parse
from urllib.parse import quote as url_quote
from urllib.parse import quote_plus as url_quote_plus
from urllib.parse import unquote as url_unquote
from urllib.parse import urlencode as url_encode
from urllib.request import urlopen as url_open
+
url_unquote_text = url_unquote
url_unquote_native = url_unquote
if PY2: # pragma: no cover
+
def exec_(code, globs=None, locs=None):
"""Execute code in a namespace."""
if globs is None:
@@ -137,12 +160,15 @@
locs = globs
exec("""exec code in globs, locs""")
- exec_("""def reraise(tp, value, tb=None):
+ exec_(
+ """def reraise(tp, value, tb=None):
raise tp, value, tb
-""")
+"""
+ )
else: # pragma: no cover
import builtins
+
exec_ = getattr(builtins, "exec")
def reraise(tp, value, tb=None):
@@ -156,6 +182,7 @@
if PY2: # pragma: no cover
+
def iteritems_(d):
return d.iteritems()
@@ -164,7 +191,10 @@
def iterkeys_(d):
return d.iterkeys()
+
+
else: # pragma: no cover
+
def iteritems_(d):
return d.items()
@@ -178,17 +208,24 @@
if PY2:
map_ = map
else:
+
def map_(*arg):
return list(map(*arg))
+
if PY2:
+
def is_nonstr_iter(v):
return hasattr(v, '__iter__')
+
+
else:
+
def is_nonstr_iter(v):
if isinstance(v, str):
return False
return hasattr(v, '__iter__')
+
if PY2:
im_func = 'im_func'
@@ -227,21 +264,27 @@
import json
if PY2:
+
def decode_path_info(path):
return path.decode('utf-8')
+
+
else:
# see PEP 3333 for why we encode WSGI PATH_INFO to latin-1 before
# decoding it to utf-8
def decode_path_info(path):
return path.encode('latin-1').decode('utf-8')
+
if PY2:
from urlparse import unquote as unquote_to_bytes
def unquote_bytes_to_wsgi(bytestring):
return unquote_to_bytes(bytestring)
+
+
else:
- # see PEP 3333 for why we decode the path to latin-1
+ # see PEP 3333 for why we decode the path to latin-1
from urllib.parse import unquote_to_bytes
def unquote_bytes_to_wsgi(bytestring):
@@ -250,6 +293,7 @@
def is_bound_method(ob):
return inspect.ismethod(ob) and getattr(ob, im_self, None) is not None
+
# support annotations and keyword-only arguments in PY3
if PY2:
@@ -262,6 +306,7 @@
else:
from itertools import zip_longest
+
def is_unbound_method(fn):
"""
This consistently verifies that the callable is bound to a
--
Gitblit v1.9.3