From 0903742e5c46b1dc52dd3f872c3f9355412f70ca Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 24 Jan 2013 23:12:05 +0900 Subject: moar pep8 cleanup! watch out the skynet gadget on line 42 --- src/leap/soledad/__init__.py | 1 - src/leap/soledad/tests/test_couch.py | 4 ++-- src/leap/soledad/tests/u1db_tests/test_backends.py | 4 ++-- src/leap/soledad/tests/u1db_tests/test_http_database.py | 2 +- src/leap/soledad/util.py | 1 - 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/leap') diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index cbd4bb0d..faacd70c 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -46,7 +46,6 @@ class Soledad(object): # Management of secret for symmetric encryption #------------------------------------------------------------------------- - #------------------------------------------------------------------------- # Management of secret for symmetric encryption #------------------------------------------------------------------------- diff --git a/src/leap/soledad/tests/test_couch.py b/src/leap/soledad/tests/test_couch.py index b7fab193..5e8d6126 100644 --- a/src/leap/soledad/tests/test_couch.py +++ b/src/leap/soledad/tests/test_couch.py @@ -41,7 +41,7 @@ def make_couch_database_for_test(test, replica_uid): def copy_couch_database_for_test(test, db): new_db = couch.CouchDatabase('http://localhost:5984', - db._replica_uid+'_copy', + db._replica_uid + '_copy', replica_uid=db._replica_uid or 'test') gen, docs = db.get_all_docs(include_deleted=True) for doc in docs: @@ -112,7 +112,7 @@ class CouchWithConflictsTests( # the server, so indexing makes no sense. Thus, we ignore index testing for # now. -#class CouchIndexTests(DatabaseIndexTests): +# class CouchIndexTests(DatabaseIndexTests): # # scenarios = COUCH_SCENARIOS # diff --git a/src/leap/soledad/tests/u1db_tests/test_backends.py b/src/leap/soledad/tests/u1db_tests/test_backends.py index 81150994..a53b01ba 100644 --- a/src/leap/soledad/tests/u1db_tests/test_backends.py +++ b/src/leap/soledad/tests/u1db_tests/test_backends.py @@ -953,7 +953,7 @@ class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests): def test_put_doc_if_newer_autoresolve_3(self): doc_a1 = self.db.create_doc_from_json(simple_doc) doc_a1b1 = self.make_document(doc_a1.doc_id, 'test:1|other:1', "{}") - doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}') + doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}') doc_a3 = self.make_document(doc_a1.doc_id, 'test:3', "{}") state, _ = self.db._put_doc_if_newer( doc_a1b1, save_conflict=True, replica_uid='r', replica_gen=1, @@ -979,7 +979,7 @@ class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests): def test_put_doc_if_newer_autoresolve_4(self): doc_a1 = self.db.create_doc_from_json(simple_doc) doc_a1b1 = self.make_document(doc_a1.doc_id, 'test:1|other:1', None) - doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}') + doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}') doc_a3 = self.make_document(doc_a1.doc_id, 'test:3', None) state, _ = self.db._put_doc_if_newer( doc_a1b1, save_conflict=True, replica_uid='r', replica_gen=1, diff --git a/src/leap/soledad/tests/u1db_tests/test_http_database.py b/src/leap/soledad/tests/u1db_tests/test_http_database.py index 40a839a5..f21e6da1 100644 --- a/src/leap/soledad/tests/u1db_tests/test_http_database.py +++ b/src/leap/soledad/tests/u1db_tests/test_http_database.py @@ -200,7 +200,7 @@ class TestHTTPDatabaseCtrWithCreds(tests.TestCase): 'token_key': tests.token1.key, 'token_secret': tests.token1.secret }}) - self.assertIn('oauth', db1._creds) + self.assertIn('oauth', db1._creds) class TestHTTPDatabaseIntegration(tests.TestCaseWithServer): diff --git a/src/leap/soledad/util.py b/src/leap/soledad/util.py index 319d28ab..00625e86 100644 --- a/src/leap/soledad/util.py +++ b/src/leap/soledad/util.py @@ -53,4 +53,3 @@ class GPGWrapper(gnupg.GPG): logger.debug('send_keys result: %r', result.__dict__) data.close() return result - -- cgit v1.2.3