summaryrefslogtreecommitdiff
path: root/passlib/apache.py
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2011-12-06 16:32:48 -0500
committerEli Collins <elic@assurancetechnologies.com>2011-12-06 16:32:48 -0500
commita0f6c8902dca04de87deaebd8c042690275d1484 (patch)
tree621fb9f1c3753d8e6e3511f12257ebb597d8129a /passlib/apache.py
parentc5ec1f9c49522a357075c9a0353b028f930e04ad (diff)
downloadpasslib-a0f6c8902dca04de87deaebd8c042690275d1484.tar.gz
ran a custom 2to3 fixer to replace all u"" with u() and add an import from compat.u
Diffstat (limited to 'passlib/apache.py')
-rw-r--r--passlib/apache.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/passlib/apache.py b/passlib/apache.py
index 1d50c8f..37b9024 100644
--- a/passlib/apache.py
+++ b/passlib/apache.py
@@ -13,7 +13,7 @@ import sys
from passlib.context import CryptContext
from passlib.utils import render_bytes, bjoin, bytes, b, \
to_unicode, to_bytes, consteq
-from passlib.utils.compat import lmap, unicode
+from passlib.utils.compat import lmap, unicode, u
#pkg
#local
__all__ = [
@@ -59,7 +59,7 @@ class _CommonFile(object):
def __init__(self, path=None, autoload=True,
encoding=DEFAULT_ENCODING,
):
- if encoding and u":\n".encode(encoding) != b(":\n"):
+ if encoding and u(":\n").encode(encoding) != b(":\n"):
#rest of file assumes ascii bytes, and uses ":" as separator.
raise ValueError("encoding must be 7-bit ascii compatible")
self.encoding = encoding