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/handlers/mssql.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/handlers/mssql.py')
| -rw-r--r-- | passlib/handlers/mssql.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/passlib/handlers/mssql.py b/passlib/handlers/mssql.py index d50100f..21d7133 100644 --- a/passlib/handlers/mssql.py +++ b/passlib/handlers/mssql.py @@ -43,7 +43,7 @@ from warnings import warn # site # pkg from passlib.utils import consteq -from passlib.utils.compat import b, bytes, bascii_to_str, unicode, u +from passlib.utils.compat import bascii_to_str, unicode, u import passlib.utils.handlers as uh # local __all__ = [ @@ -59,7 +59,7 @@ def _raw_mssql(secret, salt): assert isinstance(salt, bytes) return sha1(secret.encode("utf-16-le") + salt).digest() -BIDENT = b("0x0100") +BIDENT = b"0x0100" ##BIDENT2 = b("\x01\x00") UIDENT = u("0x0100") @@ -127,7 +127,7 @@ class mssql2000(uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler): setting_kwds = ("salt",) checksum_size = 40 min_salt_size = max_salt_size = 4 - _stub_checksum = b("\x00") * 40 + _stub_checksum = b"\x00" * 40 #=================================================================== # formatting @@ -206,7 +206,7 @@ class mssql2005(uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler): checksum_size = 20 min_salt_size = max_salt_size = 4 - _stub_checksum = b("\x00") * 20 + _stub_checksum = b"\x00" * 20 #=================================================================== # formatting |