Changeset 3857 for accountmanagerplugin/trunk

Timestamp:

06/17/08 14:21:53 (5 months ago)

Author:

mgood

Message:

make sure last line of ht files has a newline (fixes #3200)

Files:

• accountmanagerplugin/trunk/acct_mgr/htfile.py (modified) (1 diff)
• accountmanagerplugin/trunk/acct_mgr/tests/htfile.py (modified) (1 diff)

accountmanagerplugin/trunk/acct_mgr/htfile.py

@@ -84 +84 @@
-                        print userline
-                    matched = True
-se
+if line.endswith('\n')
-                    print line,
+                else: # make sure the last line has a newline
+                    print line
-        except EnvironmentError, e:
-            if e.errno == errno.ENOENT:

accountmanagerplugin/trunk/acct_mgr/tests/htfile.py

@@ -86 +86 @@
-                               'user:$apr1$xW/09...$fb150dT95SoL1HwXtHS/I0')
-
+    def test_add_with_no_trailing_newline(self):
+        filename = self._create_file('test_add_with_no_trailing_newline',
+                                     content='user:$apr1$'
+                                             'xW/09...$fb150dT95SoL1HwXtHS/I0')
+        self.env.config.set('account-manager', 'password_file', filename)
+        self.assertTrue(self.store.check_password('user', 'password'))
+        self.store.set_password('user2', 'password2')
+        self.assertTrue(self.store.check_password('user', 'password'))
+        self.assertTrue(self.store.check_password('user2', 'password2'))
+
-
-def suite():