summaryrefslogtreecommitdiff
path: root/passlib/tests/test_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/tests/test_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/tests/test_apache.py')
-rw-r--r--passlib/tests/test_apache.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/passlib/tests/test_apache.py b/passlib/tests/test_apache.py
index aa61543..9d69001 100644
--- a/passlib/tests/test_apache.py
+++ b/passlib/tests/test_apache.py
@@ -14,6 +14,7 @@ from passlib import apache
from passlib.utils import b, native_str, bytes
from passlib.utils.compat import irange, unicode
from passlib.tests.utils import TestCase, mktemp, gae_env, get_file, set_file
+from passlib.utils.compat import u
#module
log = getLogger(__name__)
@@ -178,12 +179,12 @@ class HtpasswdFileTest(TestCase):
#check sample utf-8
ht = apache.HtpasswdFile._from_string(self.sample_04_utf8, encoding="utf-8")
- self.assertEqual(ht.users(), [ u"user\u00e6" ])
+ self.assertEqual(ht.users(), [ u("user\u00e6") ])
#check sample latin-1
ht = apache.HtpasswdFile._from_string(self.sample_04_latin1,
encoding="latin-1")
- self.assertEqual(ht.users(), [ u"user\u00e6" ])
+ self.assertEqual(ht.users(), [ u("user\u00e6") ])
def test_08_to_string(self):
"test to_string"
@@ -359,7 +360,7 @@ class HtdigestFileTest(TestCase):
#check returns unicode if encoding explicitly set
ht = apache.HtdigestFile._from_string(self.sample_01, encoding="utf-8")
self.assertIsInstance(ht.realms()[0], unicode)
- self.assertIsInstance(ht.users(u"realm")[0], unicode)
+ self.assertIsInstance(ht.users(u("realm"))[0], unicode)
#check returns bytes if encoding explicitly disabled
ht = apache.HtdigestFile._from_string(self.sample_01, encoding=None)
@@ -368,13 +369,13 @@ class HtdigestFileTest(TestCase):
#check sample utf-8
ht = apache.HtdigestFile._from_string(self.sample_04_utf8, encoding="utf-8")
- self.assertEqual(ht.realms(), [ u"realm\u00e6" ])
- self.assertEqual(ht.users(u"realm\u00e6"), [ u"user\u00e6" ])
+ self.assertEqual(ht.realms(), [ u("realm\u00e6") ])
+ self.assertEqual(ht.users(u("realm\u00e6")), [ u("user\u00e6") ])
#check sample latin-1
ht = apache.HtdigestFile._from_string(self.sample_04_latin1, encoding="latin-1")
- self.assertEqual(ht.realms(), [ u"realm\u00e6" ])
- self.assertEqual(ht.users(u"realm\u00e6"), [ u"user\u00e6" ])
+ self.assertEqual(ht.realms(), [ u("realm\u00e6") ])
+ self.assertEqual(ht.users(u("realm\u00e6")), [ u("user\u00e6") ])
def test_10_to_string(self):