File: password-2.5-compat.diff

package info (click to toggle)
python-django 1.4.5-1%2Bdeb7u16
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 44,168 kB
  • sloc: python: 140,205; xml: 659; makefile: 160; sh: 145; sql: 7
file content (81 lines) | stat: -rw-r--r-- 2,519 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
Last-updated: 2013-09-14
Origin: https://github.com/django/django/commit/6903d1690a92aa040adfb0c8eb37cf62e4206714
Author: Russell Keith-Magee
Description: Removed usage of b"" string syntax for Python 2.5 compatibility.

--- a/django/contrib/auth/tests/hashers.py
+++ b/django/contrib/auth/tests/hashers.py
@@ -33,7 +33,7 @@
         self.assertRaises(
             ValueError,
             make_password,
-            b"1" * (MAXIMUM_PASSWORD_LENGTH + 1),
+            "1" * (MAXIMUM_PASSWORD_LENGTH + 1),
         )
 
     def test_pkbdf2(self):
@@ -47,7 +47,7 @@
         self.assertRaises(
             ValueError,
             make_password,
-            b"1" * (MAXIMUM_PASSWORD_LENGTH + 1),
+            "1" * (MAXIMUM_PASSWORD_LENGTH + 1),
             "seasalt",
             "pbkdf2_sha256",
         )
@@ -63,7 +63,7 @@
         self.assertRaises(
             ValueError,
             make_password,
-            b"1" * (MAXIMUM_PASSWORD_LENGTH + 1),
+            "1" * (MAXIMUM_PASSWORD_LENGTH + 1),
             "seasalt",
             "sha1",
         )
@@ -79,7 +79,7 @@
         self.assertRaises(
             ValueError,
             make_password,
-            b"1" * (MAXIMUM_PASSWORD_LENGTH + 1),
+            "1" * (MAXIMUM_PASSWORD_LENGTH + 1),
             "seasalt",
             "md5",
         )
@@ -99,7 +99,7 @@
         self.assertRaises(
             ValueError,
             make_password,
-            b"1" * (MAXIMUM_PASSWORD_LENGTH + 1),
+            "1" * (MAXIMUM_PASSWORD_LENGTH + 1),
             "",
             "unsalted_md5",
         )
@@ -115,7 +115,7 @@
         self.assertRaises(
             ValueError,
             make_password,
-            b"1" * (MAXIMUM_PASSWORD_LENGTH + 1),
+            "1" * (MAXIMUM_PASSWORD_LENGTH + 1),
             "seasalt",
             "crypt",
         )
@@ -131,7 +131,7 @@
         self.assertRaises(
             ValueError,
             make_password,
-            b"1" * (MAXIMUM_PASSWORD_LENGTH + 1),
+            "1" * (MAXIMUM_PASSWORD_LENGTH + 1),
             hasher="bcrypt",
         )
 
@@ -154,8 +154,8 @@
         def encode(s, password, salt):
             return True
 
-        self.assertTrue(encode(None, b"1234", b"1234"))
-        self.assertRaises(ValueError, encode, None, b"1234567890A", b"1234")
+        self.assertTrue(encode(None, "1234", "1234"))
+        self.assertRaises(ValueError, encode, None, "1234567890A", "1234")
 
     def test_low_level_pkbdf2(self):
         hasher = PBKDF2PasswordHasher()