summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util/compat.py
diff options
context:
space:
mode:
authorBrian Jarrett <celttechie@gmail.com>2014-07-20 12:44:40 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-07-20 12:44:40 -0400
commitcca03097f47f22783d42d1853faac6cf84607c5a (patch)
tree4fe1a63d03a2d88d1cf37e1167759dfaf84f4ce7 /lib/sqlalchemy/util/compat.py
parent827329a0cca5351094a1a86b6b2be2b9182f0ae2 (diff)
downloadsqlalchemy-cca03097f47f22783d42d1853faac6cf84607c5a.tar.gz
- apply pep8 formatting to sqlalchemy/sql, sqlalchemy/util, sqlalchemy/dialects,
sqlalchemy/orm, sqlalchemy/event, sqlalchemy/testing
Diffstat (limited to 'lib/sqlalchemy/util/compat.py')
-rw-r--r--lib/sqlalchemy/util/compat.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 35dca92ff..7f2238a13 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -42,13 +42,14 @@ else:
safe_kwarg = str
ArgSpec = collections.namedtuple("ArgSpec",
- ["args", "varargs", "keywords", "defaults"])
+ ["args", "varargs", "keywords", "defaults"])
if py3k:
import builtins
from inspect import getfullargspec as inspect_getfullargspec
- from urllib.parse import quote_plus, unquote_plus, parse_qsl, quote, unquote
+ from urllib.parse import (quote_plus, unquote_plus,
+ parse_qsl, quote, unquote)
import configparser
from io import StringIO
@@ -56,8 +57,8 @@ if py3k:
def inspect_getargspec(func):
return ArgSpec(
- *inspect_getfullargspec(func)[0:4]
- )
+ *inspect_getfullargspec(func)[0:4]
+ )
string_types = str,
binary_type = bytes
@@ -95,10 +96,11 @@ if py3k:
itertools_imap = map
from itertools import zip_longest
-
import base64
+
def b64encode(x):
return base64.b64encode(x).decode('ascii')
+
def b64decode(x):
return base64.b64decode(x.encode('ascii'))
@@ -115,6 +117,7 @@ else:
binary_type = str
text_type = unicode
int_types = int, long
+
def iterbytes(buf):
return (ord(byte) for byte in buf)
@@ -160,7 +163,6 @@ else:
from itertools import izip_longest as zip_longest
-
import time
if win32 or jython:
time_func = time.clock
@@ -186,7 +188,7 @@ if py3k:
reraise(type(exception), exception, tb=exc_tb, cause=exc_value)
else:
exec("def reraise(tp, value, tb=None, cause=None):\n"
- " raise tp, value, tb\n")
+ " raise tp, value, tb\n")
def raise_from_cause(exception, exc_info=None):
# not as nice as that of Py3K, but at least preserves
@@ -218,10 +220,9 @@ def with_metaclass(meta, *bases):
class metaclass(meta):
__call__ = type.__call__
__init__ = type.__init__
+
def __new__(cls, name, this_bases, d):
if this_bases is None:
return type.__new__(cls, name, (), d)
return meta(name, bases, d)
return metaclass('temporary_class', None, {})
-
-