[Checkins] SVN: zope.login/trunk/src/zope/login/ Simplify and code cleanup

[Hanno Schlichting]

Log message for revision 107456:
  Simplify and code cleanup
  

Changed:
  U   zope.login/trunk/src/zope/login/ftp.py
  U   zope.login/trunk/src/zope/login/tests/__init__.py
  U   zope.login/trunk/src/zope/login/tests/test_basicauth.py
  U   zope.login/trunk/src/zope/login/tests/test_ftpauth.py

-=-
Modified: zope.login/trunk/src/zope/login/ftp.py
===================================================================
--- zope.login/trunk/src/zope/login/ftp.py	2009-12-31 16:57:16 UTC (rev 107455)
+++ zope.login/trunk/src/zope/login/ftp.py	2009-12-31 17:00:02 UTC (rev 107456)
@@ -16,6 +16,7 @@
 from zope.component import adapts
 from zope.publisher.interfaces.ftp import IFTPCredentials
 
+
 class FTPAuth(LoginPassword):
     """ILoginPassword adapter for handling common FTP authentication."""
 

Modified: zope.login/trunk/src/zope/login/tests/__init__.py
===================================================================
--- zope.login/trunk/src/zope/login/tests/__init__.py	2009-12-31 16:57:16 UTC (rev 107455)
+++ zope.login/trunk/src/zope/login/tests/__init__.py	2009-12-31 17:00:02 UTC (rev 107456)
@@ -0,0 +1 @@
+#
\ No newline at end of file

Modified: zope.login/trunk/src/zope/login/tests/test_basicauth.py
===================================================================
--- zope.login/trunk/src/zope/login/tests/test_basicauth.py	2009-12-31 16:57:16 UTC (rev 107455)
+++ zope.login/trunk/src/zope/login/tests/test_basicauth.py	2009-12-31 17:00:02 UTC (rev 107456)
@@ -11,14 +11,12 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Test Basic Authentication Adapter
 
-$Id$
-"""
-import unittest
+from unittest import TestCase
 
 from zope.publisher.http import BasicAuthAdapter
 
+
 class Request(object):
 
     def __init__(self, lpw):
@@ -32,7 +30,7 @@
         self.challenge = challenge
 
 
-class Test(unittest.TestCase):
+class Test(TestCase):
 
     def testBasicAuthAdapter(self):
         r = Request(None)
@@ -49,10 +47,3 @@
         a = BasicAuthAdapter(r)
         a.needLogin("tim")
         self.assertEqual(r.challenge, 'basic realm="tim"')
-
-def test_suite():
-    loader=unittest.TestLoader()
-    return loader.loadTestsFromTestCase(Test)
-
-if __name__=='__main__':
-    unittest.TextTestRunner().run(test_suite())

Modified: zope.login/trunk/src/zope/login/tests/test_ftpauth.py
===================================================================
--- zope.login/trunk/src/zope/login/tests/test_ftpauth.py	2009-12-31 16:57:16 UTC (rev 107455)
+++ zope.login/trunk/src/zope/login/tests/test_ftpauth.py	2009-12-31 17:00:02 UTC (rev 107456)
@@ -11,16 +11,14 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""FTP Authentication Test
 
-$Id$
-"""
-from unittest import TestCase, TestSuite, main, makeSuite
-from zope.publisher.interfaces.ftp import IFTPCredentials
-from zope.interface import implements
+from unittest import TestCase
 
+from zope.interface import implements
 from zope.publisher.ftp import FTPAuth
+from zope.publisher.interfaces.ftp import IFTPCredentials
 
+
 class FTPCredentials(object):
     __doc__ = IFTPCredentials.__doc__
 
@@ -53,11 +51,3 @@
         auth = FTPAuth(request)
         self.assertEqual(auth.getLogin(), None)
         self.assertEqual(auth.getPassword(), None)
-
-def test_suite():
-    return TestSuite((
-        makeSuite(Test),
-        ))
-
-if __name__=='__main__':
-    main(defaultTest='test_suite')