diff options
-rw-r--r-- | Lib/bsddb/dbobj.py | 1 | ||||
-rw-r--r-- | Lib/bsddb/dbshelve.py | 3 | ||||
-rw-r--r-- | Lib/bsddb/dbtables.py | 1 | ||||
-rw-r--r-- | Lib/bsddb/dbutils.py | 1 | ||||
-rw-r--r-- | Lib/bsddb/test/test_associate.py | 8 | ||||
-rw-r--r-- | Lib/bsddb/test/test_basics.py | 1 | ||||
-rw-r--r-- | Lib/bsddb/test/test_compat.py | 2 | ||||
-rw-r--r-- | Lib/bsddb/test/test_dbobj.py | 1 | ||||
-rw-r--r-- | Lib/bsddb/test/test_dbshelve.py | 2 | ||||
-rw-r--r-- | Lib/bsddb/test/test_dbtables.py | 2 | ||||
-rw-r--r-- | Lib/bsddb/test/test_env_close.py | 2 | ||||
-rw-r--r-- | Lib/bsddb/test/test_get_none.py | 2 | ||||
-rw-r--r-- | Lib/bsddb/test/test_join.py | 2 | ||||
-rw-r--r-- | Lib/bsddb/test/test_recno.py | 2 | ||||
-rw-r--r-- | Lib/httplib.py | 2 | ||||
-rw-r--r-- | Lib/imaplib.py | 4 | ||||
-rw-r--r-- | Lib/nntplib.py | 1 | ||||
-rw-r--r-- | Lib/test/test_bsddb3.py | 1 | ||||
-rw-r--r-- | Lib/test/test_format.py | 8 | ||||
-rw-r--r-- | Lib/test/test_normalization.py | 3 |
20 files changed, 13 insertions, 36 deletions
diff --git a/Lib/bsddb/dbobj.py b/Lib/bsddb/dbobj.py index 9c3e90f..10e036a 100644 --- a/Lib/bsddb/dbobj.py +++ b/Lib/bsddb/dbobj.py @@ -175,4 +175,3 @@ class DB: return apply(self._cobj.verify, args, kwargs) def set_get_returns_none(self, *args, **kwargs): return apply(self._cobj.set_get_returns_none, args, kwargs) - diff --git a/Lib/bsddb/dbshelve.py b/Lib/bsddb/dbshelve.py index ab63636..6ac54b7 100644 --- a/Lib/bsddb/dbshelve.py +++ b/Lib/bsddb/dbshelve.py @@ -286,6 +286,3 @@ class DBShelfCursor: #--------------------------------------------------------------------------- - - - diff --git a/Lib/bsddb/dbtables.py b/Lib/bsddb/dbtables.py index 2c65198..4841c28 100644 --- a/Lib/bsddb/dbtables.py +++ b/Lib/bsddb/dbtables.py @@ -627,4 +627,3 @@ class bsdTableDB : if txn : txn.abort() raise TableDBError, dberror[1] - diff --git a/Lib/bsddb/dbutils.py b/Lib/bsddb/dbutils.py index d21069f..1a8bc78 100644 --- a/Lib/bsddb/dbutils.py +++ b/Lib/bsddb/dbutils.py @@ -72,4 +72,3 @@ def DeadlockWrap(function, *_args, **_kwargs): #------------------------------------------------------------------------ - diff --git a/Lib/bsddb/test/test_associate.py b/Lib/bsddb/test/test_associate.py index f59d881..305a794 100644 --- a/Lib/bsddb/test/test_associate.py +++ b/Lib/bsddb/test/test_associate.py @@ -248,10 +248,10 @@ class ShelveAssociateTestCase(AssociateTestCase): class ShelveAssociateHashTestCase(ShelveAssociateTestCase): - dbtype = db.DB_HASH + dbtype = db.DB_HASH class ShelveAssociateBTreeTestCase(ShelveAssociateTestCase): - dbtype = db.DB_BTREE + dbtype = db.DB_BTREE class ShelveAssociateRecnoTestCase(ShelveAssociateTestCase): dbtype = db.DB_RECNO @@ -287,10 +287,10 @@ class ThreadedAssociateTestCase(AssociateTestCase): class ThreadedAssociateHashTestCase(ShelveAssociateTestCase): - dbtype = db.DB_HASH + dbtype = db.DB_HASH class ThreadedAssociateBTreeTestCase(ShelveAssociateTestCase): - dbtype = db.DB_BTREE + dbtype = db.DB_BTREE class ThreadedAssociateRecnoTestCase(ShelveAssociateTestCase): dbtype = db.DB_RECNO diff --git a/Lib/bsddb/test/test_basics.py b/Lib/bsddb/test/test_basics.py index 257b384..f2ccb8a 100644 --- a/Lib/bsddb/test/test_basics.py +++ b/Lib/bsddb/test/test_basics.py @@ -811,4 +811,3 @@ def suite(): if __name__ == '__main__': unittest.main( defaultTest='suite' ) - diff --git a/Lib/bsddb/test/test_compat.py b/Lib/bsddb/test/test_compat.py index 5d7a219..2514d02 100644 --- a/Lib/bsddb/test/test_compat.py +++ b/Lib/bsddb/test/test_compat.py @@ -165,5 +165,3 @@ def suite(): if __name__ == '__main__': unittest.main( defaultTest='suite' ) - - diff --git a/Lib/bsddb/test/test_dbobj.py b/Lib/bsddb/test/test_dbobj.py index ee700e3..c1b82fe 100644 --- a/Lib/bsddb/test/test_dbobj.py +++ b/Lib/bsddb/test/test_dbobj.py @@ -69,4 +69,3 @@ def suite(): if __name__ == '__main__': unittest.main( defaultTest='suite' ) - diff --git a/Lib/bsddb/test/test_dbshelve.py b/Lib/bsddb/test/test_dbshelve.py index 580c75f..7705882 100644 --- a/Lib/bsddb/test/test_dbshelve.py +++ b/Lib/bsddb/test/test_dbshelve.py @@ -301,5 +301,3 @@ def suite(): if __name__ == '__main__': unittest.main( defaultTest='suite' ) - - diff --git a/Lib/bsddb/test/test_dbtables.py b/Lib/bsddb/test/test_dbtables.py index a346585..bfa7586 100644 --- a/Lib/bsddb/test/test_dbtables.py +++ b/Lib/bsddb/test/test_dbtables.py @@ -233,7 +233,7 @@ class TableDBTestCase(unittest.TestCase): assert len(values) == 1, values assert values[0]['d'] == "is for dog", values assert values[0]['a'] == "is for aardvark", values - + def test_Delete(self): tabname = "test_Delete" self.tdb.CreateTable(tabname, ['x', 'y', 'z']) diff --git a/Lib/bsddb/test/test_env_close.py b/Lib/bsddb/test/test_env_close.py index 01b3516..f6b0a0d 100644 --- a/Lib/bsddb/test/test_env_close.py +++ b/Lib/bsddb/test/test_env_close.py @@ -82,5 +82,3 @@ def suite(): if __name__ == '__main__': unittest.main( defaultTest='suite' ) - - diff --git a/Lib/bsddb/test/test_get_none.py b/Lib/bsddb/test/test_get_none.py index 0e1fa93..487bdf0 100644 --- a/Lib/bsddb/test/test_get_none.py +++ b/Lib/bsddb/test/test_get_none.py @@ -94,5 +94,3 @@ def suite(): if __name__ == '__main__': unittest.main( defaultTest='suite' ) - - diff --git a/Lib/bsddb/test/test_join.py b/Lib/bsddb/test/test_join.py index bb5c316..00ccd36 100644 --- a/Lib/bsddb/test/test_join.py +++ b/Lib/bsddb/test/test_join.py @@ -10,5 +10,3 @@ import unittest from bsddb import db from test.test_support import verbose - - diff --git a/Lib/bsddb/test/test_recno.py b/Lib/bsddb/test/test_recno.py index eaeeb8a..40d9fca 100644 --- a/Lib/bsddb/test/test_recno.py +++ b/Lib/bsddb/test/test_recno.py @@ -254,5 +254,3 @@ def suite(): if __name__ == '__main__': unittest.main( defaultTest='suite' ) - - diff --git a/Lib/httplib.py b/Lib/httplib.py index d367ea7..e98fa46 100644 --- a/Lib/httplib.py +++ b/Lib/httplib.py @@ -352,7 +352,7 @@ class HTTPResponse: # For older HTTP, Keep-Alive indiciates persistent connection. if self.msg.getheader('keep-alive'): return False - + # Proxy-Connection is a netscape hack. pconn = self.msg.getheader('proxy-connection') if pconn and pconn.lower().find("keep-alive") >= 0: diff --git a/Lib/imaplib.py b/Lib/imaplib.py index da456d6..47fbafa5 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -330,7 +330,7 @@ class IMAP4: """ mech = mechanism.upper() cap = 'AUTH=%s' % mech - #if not cap in self.capabilities: # Let the server decide! + #if not cap in self.capabilities: # Let the server decide! # raise self.error("Server doesn't allow %s authentication." % mech) self.literal = _Authenticator(authobject).process typ, dat = self._simple_command('AUTHENTICATE', mech) @@ -1401,7 +1401,7 @@ if __name__ == '__main__': else: M = IMAP4(host) if M.state == 'AUTH': - test_seq1 = test_seq1[1:] # Login not needed + test_seq1 = test_seq1[1:] # Login not needed M._mesg('PROTOCOL_VERSION = %s' % M.PROTOCOL_VERSION) M._mesg('CAPABILITIES = %s' % `M.capabilities`) diff --git a/Lib/nntplib.py b/Lib/nntplib.py index ea831cf..16e7550 100644 --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -590,4 +590,3 @@ if __name__ == '__main__': print "%7s %s" % item resp = s.quit() print resp - diff --git a/Lib/test/test_bsddb3.py b/Lib/test/test_bsddb3.py index a42238d..0b3c665 100644 --- a/Lib/test/test_bsddb3.py +++ b/Lib/test/test_bsddb3.py @@ -57,4 +57,3 @@ if __name__ == '__main__': print '-=' * 38 unittest.main( defaultTest='suite' ) - diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py index da4d85a..f791874 100644 --- a/Lib/test/test_format.py +++ b/Lib/test/test_format.py @@ -221,13 +221,13 @@ if have_unicode: test_exc('%d', '1', TypeError, "int argument required") test_exc('%g', '1', TypeError, "float argument required") -test_exc('no format', '1', TypeError, +test_exc('no format', '1', TypeError, "not all arguments converted during string formatting") -test_exc('no format', u'1', TypeError, +test_exc('no format', u'1', TypeError, "not all arguments converted during string formatting") -test_exc(u'no format', '1', TypeError, +test_exc(u'no format', '1', TypeError, "not all arguments converted during string formatting") -test_exc(u'no format', u'1', TypeError, +test_exc(u'no format', u'1', TypeError, "not all arguments converted during string formatting") if sys.maxint == 2**32-1: diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py index a263fc5..39c48a4 100644 --- a/Lib/test/test_normalization.py +++ b/Lib/test/test_normalization.py @@ -46,7 +46,7 @@ for line in data: if verbose: print line - + # Perform tests verify(c2 == NFC(c1) == NFC(c2) == NFC(c3), line) verify(c4 == NFC(c4) == NFC(c5), line) @@ -65,4 +65,3 @@ for c in range(sys.maxunicode+1): if X in part1_data: continue assert X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X), c - |