From 1427c60d7dff3fcfa6c30e16fd9815fd4787b458 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Wed, 28 May 2014 15:24:34 -0300
Subject: Fix stuff from kali's review.

---
 client/src/leap/soledad/client/sync.py   | 15 ++++++++-------
 client/src/leap/soledad/client/target.py |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'client')

diff --git a/client/src/leap/soledad/client/sync.py b/client/src/leap/soledad/client/sync.py
index 6e9e23fa..c29dd769 100644
--- a/client/src/leap/soledad/client/sync.py
+++ b/client/src/leap/soledad/client/sync.py
@@ -52,7 +52,7 @@ class ClientSyncState(object):
 
     @property
     def _public_attr_keys(self):
-        return [k for k in self._public_attrs]
+        return self._public_attrs.keys()
 
     def __init__(self, db=None):
         """
@@ -113,15 +113,16 @@ class ClientSyncState(object):
 
     def has_stored_info(self):
         """
-        Return wether there is any sync state info stored on the database.
+        Return whether there is any sync state info stored on the database.
 
-        :return: Wether there's any sync state info store on db.
+        :return: Whether there's any sync state info store on db.
         :rtype: bool
         """
         return self._db is not None and self._db.sync_state is not None
 
     def __str__(self):
-        ', '.join(['%s: %s' % (k, getattr(self, k)) for k in self._public_attr_keys])
+        return 'ClientSyncState: %s' % ', '.join(
+            ['%s: %s' % (k, getattr(self, k)) for k in self._public_attr_keys])
 
 class Synchronizer(U1DBSynchronizer):
     """
@@ -140,7 +141,7 @@ class Synchronizer(U1DBSynchronizer):
         """
         Synchronize documents between source and target.
 
-        :param autocreate: Wether the target replica should be created or not.
+        :param autocreate: Whether the target replica should be created or not.
         :type autocreate: bool
         """
         sync_target = self.sync_target
@@ -173,8 +174,8 @@ class Synchronizer(U1DBSynchronizer):
                     raise
                 # will try to ask sync_exchange() to create the db
                 self.target_replica_uid = None
-                target_gen, target_trans_id = 0, ''
-                target_my_gen, target_my_trans_id = 0, ''
+                target_gen, target_trans_id = (0, '')
+                target_my_gen, target_my_trans_id = (0, '')
 
         # make sure we'll have access to target replica uid once it exists
         if self.target_replica_uid is None:
diff --git a/client/src/leap/soledad/client/target.py b/client/src/leap/soledad/client/target.py
index a3b8ed00..93de98d3 100644
--- a/client/src/leap/soledad/client/target.py
+++ b/client/src/leap/soledad/client/target.py
@@ -703,9 +703,9 @@ class SoledadSyncTarget(HTTPSyncTarget, TokenBasedAuth):
     @property
     def stopped(self):
         """
-        Return wether this sync session is stopped.
+        Return whether this sync session is stopped.
 
-        :return: Wether this sync session is stopped.
+        :return: Whether this sync session is stopped.
         :rtype: bool
         """
         with self._stop_lock:
-- 
cgit v1.2.3