diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2015-01-10 18:52:34 -0500 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2015-01-10 18:52:34 -0500 |
| commit | cf8fce4325d259490ada92caa624cb1a1c8e21b5 (patch) | |
| tree | f52587a6308cf389dbadf56492dfbeb592c9ee47 /passlib/apache.py | |
| parent | 55062360b26ace8d2521fe67a518ebf434f7847f (diff) | |
| download | passlib-cf8fce4325d259490ada92caa624cb1a1c8e21b5.tar.gz | |
removed a LOT of compatibility shims -- dropped python 2.5, 3.0, and 3.1 support;
as well as PyPy 1.x and Jython 2.5.
shims removed
-------------
* b() shim replaced with b'' (py25)
* 'bytes' alias no longer needed (py25)
* callable() shim no longer needed (py30,31)
* PY_MIN_32 flag replaced with PY3 flag (py30,31)
* removed 'abc' module stub used by passlib.ifc (py25)
* removed chain_from_iterable() backport (py25)
* tests: removed catch_warnings() backport,
replaced refs with real warnings.catch_warnings() (py25)
* tests: removed unittest2 backports (py25, py30, py31) --
now throw hard error if unittest2 not present under py26
(the only release remaining which lacks the unittest2 features)
* removed SUPPORTS_DIR_METHOD conditional (py25, pypy 1.x)
* some other minor workarounds
other
-----
* added check in passlib.compat which now throws error telling user
version isn't supported (to prevent spurious errors later)
Diffstat (limited to 'passlib/apache.py')
| -rw-r--r-- | passlib/apache.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/passlib/apache.py b/passlib/apache.py index 4b5654c..b3917fb 100644 --- a/passlib/apache.py +++ b/passlib/apache.py @@ -14,8 +14,7 @@ from passlib.context import CryptContext from passlib.exc import ExpectedStringError from passlib.hash import htdigest from passlib.utils import render_bytes, to_bytes, deprecated_method, is_ascii_codec -from passlib.utils.compat import b, bytes, join_bytes, unicode, BytesIO, \ - iteritems, PY3 +from passlib.utils.compat import join_bytes, unicode, BytesIO, iteritems, PY3 # local __all__ = [ 'HtpasswdFile', @@ -27,10 +26,10 @@ __all__ = [ #============================================================================= _UNSET = object() -_BCOLON = b(":") +_BCOLON = b":" # byte values that aren't allowed in fields. -_INVALID_FIELD_CHARS = b(":\n\r\t\x00") +_INVALID_FIELD_CHARS = b":\n\r\t\x00" #============================================================================= # backport of OrderedDict for PY2.5 |