summaryrefslogtreecommitdiff
path: root/passlib/apache.py
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2012-05-01 12:32:56 -0400
committerEli Collins <elic@assurancetechnologies.com>2012-05-01 12:32:56 -0400
commit0f99c2a8d6106b980bb9b3c687669ae9fca5eb94 (patch)
tree36b5fdb1131df0b0d273a6bc9a84c8f8d24678b4 /passlib/apache.py
parent1f8d7b2a2cfa96a2fdc02f718692117ace747872 (diff)
downloadpasslib-0f99c2a8d6106b980bb9b3c687669ae9fca5eb94.tar.gz
moved is_ascii_codec() helper to utils
Diffstat (limited to 'passlib/apache.py')
-rw-r--r--passlib/apache.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/passlib/apache.py b/passlib/apache.py
index 869a5a5..58e0a84 100644
--- a/passlib/apache.py
+++ b/passlib/apache.py
@@ -15,7 +15,7 @@ from warnings import warn
from passlib.context import CryptContext
from passlib.exc import ExpectedStringError
from passlib.hash import htdigest
-from passlib.utils import consteq, render_bytes, to_bytes, deprecated_method
+from passlib.utils import consteq, render_bytes, to_bytes, deprecated_method, is_ascii_codec
from passlib.utils.compat import b, bytes, join_bytes, str_to_bascii, u, \
unicode, BytesIO, iteritems, imap, PY3
#pkg
@@ -35,14 +35,6 @@ _BCOLON = b(":")
# byte values that aren't allowed in fields.
_INVALID_FIELD_CHARS = b(":\n\r\t\x00")
-# helpers to detect non-ascii codecs
-_ASCII_TEST_BYTES = b("\x00\n aA:#!\x7f")
-_ASCII_TEST_UNICODE = _ASCII_TEST_BYTES.decode("ascii")
-
-def is_ascii_codec(codec):
- "test if codec is 7-bit ascii safe (e.g. latin-1, utf-8; but not utf-16)"
- return _ASCII_TEST_UNICODE.encode(codec) == _ASCII_TEST_BYTES
-
#=========================================================
# backport of OrderedDict for PY2.5
#=========================================================