Merge commit 'refs/top-bases/t/versions' into t/versions

* commit 'refs/top-bases/t/versions':
  fix breakage introduced by b39d784e1072f8aee2df6b1879d7431a5de83bc0
  prepend SL to ticket number
  pep8 / pylint / style fixes
  adjust to new filesize and creation_time properties
  fix From: address
  Add missed deps
  Actualize sweet recipe; add metadatareader.so symlink to support inplace run
  Tweak HACKING file

Conflicts:
	tests/runalltests.py
	tests/test_massops.py
	tests/test_migration_v2_v3.py

9 files changed, 167 insertions, 125 deletions

diff --git a/HACKING b/HACKING
index 5c3a436..021f49e 100644
--- a/HACKING
+++ b/HACKING
@@ -1,15 +1,29 @@
+How to contribute
+=================
+
+Useful notes how to contribute to the project.
+
 Before committing
-~~~~~~~~~~~~~~~~~
-All source files need to be passed through sugar-lint[1] command.
+-----------------
+All source files need to be passed through `sugar-lint`_ command.
 Follow sugar-lint home page instructions and especially
-"Lint files before committing" section.
-
+`"Lint files before committing"` section.
 
 Send patches
-~~~~~~~~~~~~
-Create your patches using "git format" command and send them to all maintainers
-from AUTHORS file with CCing to sugar-devel@lists.sugarlabs.org.
-The easiest way it just using "git send-email" command.
+------------
+Create your patches using ``git format`` command and send them to all
+maintainers from the :ref:`AUTHORS <AUTHORS>` file. The easiest way it just
+using ``git send-email`` command. Patches might be CCed to
+sugar-devel@lists.sugarlabs.org to attract more people to review.
+
+Gitorious forks
+---------------
+Another useful way to contribute, especially for big improvements, is creating
+Gitorious forks and request them for merge to the trunk.
 
+* http://blog.gitorious.org/2009/05/09/weve-made-a-few-changes/
+  (see `"Merge requests"` topic)
+* http://blog.gitorious.org/2009/07/15/new-merge-request-functionality/
+* http://blog.gitorious.org/2009/11/06/awesome-code-review/
 
-[1] http://wiki.sugarlabs.org/go/Activity_Team/Sugar_Lint
+.. _sugar-lint: http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Lint
diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py
index 40d8667..434f613 100644
--- a/src/carquinyol/datastore.py
+++ b/src/carquinyol/datastore.py
@@ -154,6 +154,7 @@ class DBusAPIv1(dbus.service.Object):
     @dbus.service.method(DS_DBUS_INTERFACE1,
                          in_signature='s',
                          out_signature='a{sv}')
+    @trace(logger=logger)
     def get_properties(self, uid):
         latest_versions = self._get_latest(uid)
         if not latest_versions:
@@ -542,6 +543,11 @@ class DataStore(dbus.service.Object):
     def _change_metadata(self, tree_id, version_id, metadata):
         object_id = (tree_id, version_id)
         metadata.setdefault('timestamp', time.time())
+        if 'creation_time' not in metadata:
+            old_metadata = self._metadata_store.retrieve(object_id,
+                                                         ['creation_time'])
+            metadata['creation_time'] = old_metadata['creation_time']
+
         self._metadata_store.store(object_id, metadata)
         self._index_store.store(object_id, metadata)
         self.ChangedMetadata(tree_id, version_id, metadata)
diff --git a/src/carquinyol/metadatareader.so b/src/carquinyol/metadatareader.so
new file mode 120000
index 0000000..bf6931a
--- /dev/null
+++ b/src/carquinyol/metadatareader.so
@@ -0,0 +1 @@
+.libs/metadatareader.so
\ No newline at end of file
diff --git a/sweets.recipe b/sweets.recipe
index 9616cb9..b861c35 100644
--- a/sweets.recipe
+++ b/sweets.recipe
@@ -1,4 +1,4 @@
-[DEFAULT]
+[Application]
 sweet     = sugar-datastore
 summary   = Backend of the Sugar Journal
 license   = LGPLv2.1+
@@ -7,27 +7,26 @@ homepage  = http://git.sugarlabs.org/projects/sugar-datastore
 version   = 0.90.0
 stability = testing
 
-[Component]
+exec      = %(BUILDDIR)s/bin/datastore-service
+binding   = PATH %(BUILDDIR)s/bin
+            PYTHONPATH %(BUILDDIR)s/src
+            XDG_DATA_DIRS share
 requires  = sugar-toolkit; python-cjson; xapian-bindings-python
-binding   = PATH bin; PYTHONPATH python; XDG_DATA_DIRS share
+
+[Archive]
 arch      = any
 
 [Build]
-requires  = pkg-config; intltool >= 0.33; make; gcc-c; python
-cleanup   = make distclean; ./autogen.sh
-configure = ./configure
+requires  = gnome-common; pkg-config
+            intltool >= 0.33; libtool; make; gcc-c; python
+configure = make distclean;
+            ./autogen.sh
                 --prefix=%(PREFIX)s
-                am_cv_python_pythondir=%(PREFIX)s/python
-                am_cv_python_pyexecdir=%(PREFIX)s/python
+                am_cv_python_pythondir=%(PREFIX)s/src
+                am_cv_python_pyexecdir=%(PREFIX)s/src
                 CFLAGS="%(CFLAGS)s"
 make      = make
 install   = make DESTDIR=%(DESTDIR)s install
-implement = %(install)s &&
-            rm -rf %(DESTDIR)s/%(PREFIX)s/bin &&
-            rm -rf %(DESTDIR)s/%(PREFIX)s/python &&
-            ln -s %(BUILDDIR)s/bin %(DESTDIR)s/%(PREFIX)s/ &&
-            ln -s %(BUILDDIR)s/src %(DESTDIR)s/%(PREFIX)s/python &&
-            ln -fs .libs/metadatareader.so src/carquinyol/
 
 [Source]
 exec      = ./autogen.sh && make distcheck
diff --git a/tests/Makefile b/tests/Makefile
index 5ef30e6..cf9ac60 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,8 +3,6 @@ install:
 uninstall:
 
 check:
-	# bad hack to make Python extensions work from source directory
-	cp ../src/carquinyol/.libs/*.so ../src/carquinyol/
 	@./runalltests.py
 
 valgrind:
diff --git a/tests/basic_api_v2.txt b/tests/basic_api_v2.txt
index 83c2bb2..0e4c5a1 100644
--- a/tests/basic_api_v2.txt
+++ b/tests/basic_api_v2.txt
@@ -19,9 +19,9 @@ Define some helper functions
 
 Connect to datastore using DBus and wait for it to get ready:
 >>> import dbus
->>> DS_DBUS_SERVICE = "org.laptop.sugar.DataStore"
->>> DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore"
->>> DS_DBUS_PATH = "/org/laptop/sugar/DataStore"
+>>> DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
+>>> DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'
+>>> DS_DBUS_PATH = '/org/laptop/sugar/DataStore'
 >>> bus = dbus.SessionBus()
 >>> ds = dbus.Interface(bus.get_object(DS_DBUS_SERVICE, DS_DBUS_PATH), DS_DBUS_INTERFACE)
 
@@ -70,9 +70,8 @@ previous: [dbus.Dictionary({dbus.String(u'title'): dbus.ByteArray('DS test objec
 
 Retrieve metadata for a single entry, ignoring variable data:
 >>> d=dict(ds.get_properties(o3_uid, byte_arrays=True))
->>> del d['uid'], d['timestamp']
->>> d
-{dbus.String(u'title'): dbus.ByteArray('DS test object 2', variant_level=1), dbus.String(u'mime_type'): dbus.ByteArray('text/html', variant_level=1), dbus.String(u'activity'): dbus.ByteArray('org.sugarlabs.DataStoreTest3', variant_level=1)}
+>>> del d['uid'], d['timestamp'], d['creation_time']
+>>> assert to_native(d) == {u'title': 'DS test object 2', u'mime_type': 'text/html', u'activity': 'org.sugarlabs.DataStoreTest3'}
 
 
 Find entries using "known" metadata:
diff --git a/tests/runalltests.py b/tests/runalltests.py
index f00af3b..d782611 100755
--- a/tests/runalltests.py
+++ b/tests/runalltests.py
@@ -27,20 +27,21 @@ import gobject
 
 
 logging.basicConfig(level=logging.WARN,
-    format="%(asctime)-15s %(name)s %(levelname)s: %(message)s",
-    stream=sys.stderr)
+                    format='%(asctime)-15s %(name)s %(levelname)s:'
+                           ' %(message)s',
+                    stream=sys.stderr)
 
 
 DOCTESTS = [
-    "basic_api_v2.txt",
-    "basic_api_v3.txt",
+    'basic_api_v2.txt',
+    'basic_api_v3.txt',
 ]
 DOCTEST_OPTIONS = doctest.ELLIPSIS
 DOCTEST_OPTIONS |= doctest.REPORT_ONLY_FIRST_FAILURE
 
-DS_DBUS_SERVICE = "org.laptop.sugar.DataStore"
-DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore2"
-DS_DBUS_PATH = "/org/laptop/sugar/DataStore2"
+DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
+DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore2'
+DS_DBUS_PATH = '/org/laptop/sugar/DataStore2'
 
 ENVIRONMENT_WHITELIST = [
     'LD_LIBRARY_PATH',
@@ -49,6 +50,13 @@ ENVIRONMENT_WHITELIST = [
     'SUGAR_LOGGER_LEVEL',
 ]
 
+SERVICE_TEMPLATE = """
+[D-BUS Service]
+Name = org.laptop.sugar.DataStore
+Exec = %s/bin/datastore-service
+"""
+
+
 def setup():
     """Prepare for testing and return environment.
 
@@ -70,18 +78,16 @@ def setup():
     basedir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), '..')
     python_path = [os.path.join(basedir, 'src')] + python_path
     environment['PYTHONPATH'] = ':'.join(python_path)
-    environment['PATH'] = os.path.join(basedir, 'bin')+':'+os.environ['PATH']
-
-    servicedir = os.path.join(environment['HOME'], 'dbus-1', 'services')
-    servicepath = os.path.join(servicedir, 'org.laptop.sugar.DataStore.service')
-    os.makedirs(servicedir)
-    servicefile = file(servicepath, 'w')
-    servicefile.write("""
-        [D-BUS Service]
-        Name = org.laptop.sugar.DataStore
-        Exec = %s/bin/datastore-service
-        """.replace('        ', '') % (basedir, ))
-    servicefile.close()
+    environment['PATH'] = ':'.join([os.path.join(basedir, 'bin'),
+                                    os.environ['PATH']])
+
+    service_dir = os.path.join(environment['HOME'], 'dbus-1', 'services')
+    service_path = os.path.join(service_dir,
+                                'org.laptop.sugar.DataStore.service')
+    os.makedirs(service_dir)
+    service_file = file(service_path, 'w')
+    service_file.write(SERVICE_TEMPLATE % (basedir, ))
+    service_file.close()
     environment['XDG_DATA_DIRS'] = environment['HOME']
 
     os.setpgid(0, 0)
@@ -173,7 +179,7 @@ class TestSuiteWrapper(unittest.TestCase):
 
     def shortDescription(self):
         doc = self._wrapped_suite.__doc__
-        return doc and doc.split("\n")[0].strip() or None
+        return doc and doc.split('\n')[0].strip() or None
 
     def tearDown(self):
         self._kill_data_store()
@@ -181,13 +187,13 @@ class TestSuiteWrapper(unittest.TestCase):
 
     def _kill_data_store(self):
         pgrep = subprocess.Popen(['pgrep', '-g', os.environ['DBUS_PID'],
-            '-f', 'datastore-service'],
-            close_fds=True, stdout=subprocess.PIPE)
+                                  '-f', 'datastore-service'],
+                                 close_fds=True, stdout=subprocess.PIPE)
         stdout, stderr_ = pgrep.communicate()
         pids = stdout.strip().split('\n')
         if len(pids) != 1 or not pids[0]:
             raise ValueError("Can't find (a single) data store process "
-                "(pgrep output %r)" % (stdout, ))
+                             "(pgrep output %r)" % (stdout, ))
 
         pid = int(pids[0])
         self._loop = gobject.MainLoop()
@@ -213,7 +219,7 @@ class TimedTestResult(unittest._TextTestResult):
 
     # Depending on a private class is bad style, but the only alternative is
     # copying it verbatim.
-    # pylint: disable-msg=W0212
+    # pylint: disable=W0212
 
     def __init__(self, stream, descriptions, verbosity):
         unittest._TextTestResult.__init__(self, stream, descriptions,
@@ -251,7 +257,7 @@ class TimedTestResult(unittest._TextTestResult):
             return
 
         if self.showAll:
-            self.stream.writeln("ok (%.3fs)" % (run_time, ))
+            self.stream.writeln('ok (%.3fs)' % (run_time, ))
         elif self.dots:
             self.stream.write('.')
 
@@ -298,7 +304,8 @@ def run_tests(tests):
 
 def _start_dbus(environment):
     pipe = subprocess.Popen(['dbus-launch'], stdout=subprocess.PIPE,
-        close_fds=True, env=environment, cwd=environment['HOME'])
+                            close_fds=True, env=environment,
+                            cwd=environment['HOME'])
     stdout, stderr_ = pipe.communicate()
     pid = None
     address = None
@@ -320,11 +327,11 @@ def _parse_options():
     """Parse command line arguments."""
     parser = OptionParser()
     parser.add_option('-k', '--keep', dest='keep',
-        action='store_true', default=False,
-        help='Keep temporary files')
+                      action='store_true', default=False,
+                      help='Keep temporary files')
     parser.add_option('', '--stage2', dest='stage2',
-        action='store_true', default=False,
-        help='For internal use only')
+                      action='store_true', default=False,
+                      help='For internal use only')
     return parser.parse_args()
 
 
@@ -340,8 +347,8 @@ def main(my_name, arguments):
             environment['DBUS_PID'] = str(dbus_pid)
 
             pipe = subprocess.Popen([os.path.abspath(my_name),
-                '--stage2']+arguments,
-                cwd=environment['HOME'], env=environment)
+                                     '--stage2'] + arguments,
+                                    cwd=environment['HOME'], env=environment)
             return pipe.wait()
 
         finally:
diff --git a/tests/test_massops.py b/tests/test_massops.py
index bcfa590..d7699db 100644
--- a/tests/test_massops.py
+++ b/tests/test_massops.py
@@ -5,13 +5,12 @@ import dbus
 import decorator
 import os
 import tempfile
-import time
 import unittest
 
 
-DS_DBUS_SERVICE = "org.laptop.sugar.DataStore"
-DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore2"
-DS_DBUS_PATH = "/org/laptop/sugar/DataStore2"
+DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
+DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore2'
+DS_DBUS_PATH = '/org/laptop/sugar/DataStore2'
 NUM_RUNS = int(os.environ.get('MASSOPS_RUNS', '100'))
 IGNORE_PROPERTIES = [
     'checksum',
@@ -35,12 +34,12 @@ class MassOpsTestCase(unittest.TestCase):
     """Large number of operations intended for measuring performance."""
 
     def setUp(self):
-        # pylint: disable-msg=C0103
+        # pylint: disable=C0103
         self._bus = dbus.SessionBus()
         self._datastore = dbus.Interface(self._bus.get_object(DS_DBUS_SERVICE,
-            DS_DBUS_PATH), DS_DBUS_INTERFACE)
+                                         DS_DBUS_PATH), DS_DBUS_INTERFACE)
 
-    _create_content = 'Foo bar\n'*1000
+    _create_content = 'Foo bar\n' * 1000
     _create_properties = {
         'title': 'DS test object',
         'mime_type': 'text/plain',
@@ -64,18 +63,20 @@ class MassOpsTestCase(unittest.TestCase):
     def test_find_all(self):
         """Run find() to list all entries."""
         entries, total_count = self._datastore.find({},
-            {'metadata': ['number']}, byte_arrays=True)
+                                                    {'metadata': ['number']},
+                                                    byte_arrays=True)
         self.assertEquals(total_count, NUM_RUNS)
         self.assertEquals(total_count, len(entries))
         for position, entry in enumerate(entries):
-            self.assertEquals(int(entry['number']), NUM_RUNS-position-1)
+            self.assertEquals(int(entry['number']), NUM_RUNS - position - 1)
 
     @repeat
     def test_find_all_reverse_time(self):
         """Run find() to list all entries in reverse chronological order."""
-        entries, total_count = self._datastore.find({},
-            {'metadata': ['number'], 'order_by': ['-timestamp']},
-            byte_arrays=True)
+        entries, total_count = \
+            self._datastore.find({}, {'metadata': ['number'],
+                                      'order_by': ['-timestamp']},
+                                 byte_arrays=True)
         self.assertEquals(total_count, NUM_RUNS)
         self.assertEquals(total_count, len(entries))
         for position, entry in enumerate(entries):
@@ -84,18 +85,20 @@ class MassOpsTestCase(unittest.TestCase):
     @repeat
     def test_find_all_title(self):
         """Run find() to list all entries ordered by title."""
-        entries, total_count = self._datastore.find({},
-            {'metadata': ['tree_id'], 'order_by': ['+title']},
-            byte_arrays=True)
+        entries, total_count = \
+            self._datastore.find({}, {'metadata': ['tree_id'],
+                                      'order_by': ['+title']},
+                                 byte_arrays=True)
         self.assertEquals(total_count, NUM_RUNS)
         self.assertEquals(total_count, len(entries))
 
     @repeat
     def test_find_all_reverse_title(self):
         """Run find() to list all entries ordered by title (reversed)."""
-        entries, total_count = self._datastore.find({},
-            {'metadata': ['tree_id'], 'order_by': ['-title']},
-            byte_arrays=True)
+        entries, total_count = \
+            self._datastore.find({}, {'metadata': ['tree_id'],
+                                      'order_by': ['-title']},
+                                 byte_arrays=True)
         self.assertEquals(total_count, NUM_RUNS)
         self.assertEquals(total_count, len(entries))
 
@@ -104,31 +107,37 @@ class MassOpsTestCase(unittest.TestCase):
         """Run find() to list all entries in small chunks."""
         chunk_size = 30
         for chunk_start in range(0, NUM_RUNS, 30):
-            entries, total_count = self._datastore.find({},
-                {'offset': chunk_start, 'limit': chunk_size,
-                'metadata': ['number']}, byte_arrays=True)
+            entries, total_count = \
+                self._datastore.find({}, {'offset': chunk_start,
+                                          'limit': chunk_size,
+                                          'metadata': ['number']},
+                                     byte_arrays=True)
             self.assertEquals(len(entries),
-                min(chunk_size, NUM_RUNS-chunk_start))
+                              min(chunk_size, NUM_RUNS - chunk_start))
             self.assertEquals(total_count, NUM_RUNS)
             for position, entry in enumerate(entries):
                 self.assertEquals(int(entry['number']),
-                    NUM_RUNS-(chunk_start+position)-1)
+                                  NUM_RUNS - (chunk_start + position) - 1)
 
     def test_get_properties(self):
         """Run find() to retrieve and verify single entry for all entries."""
-        for entry in self._datastore.find({}, {'metadata': ['tree_id',
-            'version_id']}, byte_arrays=True)[0]:
-
-            properties = self._datastore.find({'tree_id': entry['tree_id'],
-                'version_id': entry['version_id']}, {}, byte_arrays=True)[0][0]
+        entries = self._datastore.find({}, {'metadata': ['tree_id',
+                                                         'version_id']},
+                                       byte_arrays=True)[0]
+        for entry in entries:
+            properties = \
+                self._datastore.find({'tree_id': entry['tree_id'],
+                                      'version_id': entry['version_id']}, {},
+                                     byte_arrays=True)[0][0]
             self._filter_properties(properties)
             self.assertEquals(properties, self._create_properties)
 
     def test_get_data(self):
         """Run get_data() on all entries and verify content."""
-        for entry in self._datastore.find({}, {'metadata': ['tree_id',
-            'version_id']}, byte_arrays=True)[0]:
-
+        entries = self._datastore.find({}, {'metadata': ['tree_id',
+                                                         'version_id']},
+                                       byte_arrays=True)[0]
+        for entry in entries:
             filename = self._datastore.get_data(entry['tree_id'],
                 entry['version_id'], byte_arrays=True)
             try:
@@ -136,7 +145,7 @@ class MassOpsTestCase(unittest.TestCase):
             finally:
                 os.remove(filename)
 
-    _update_content = 'Foo bar baz\n'*1000
+    _update_content = 'Foo bar baz\n' * 1000
     _update_properties = {
         'title': 'DS test object (updated)',
         'mime_type': 'text/plain',
@@ -149,17 +158,22 @@ class MassOpsTestCase(unittest.TestCase):
         content_file = tempfile.NamedTemporaryFile()
         content_file.write(self._update_content)
         content_file.flush()
-        for entry in self._datastore.find({}, {'metadata': ['tree_id',
-            'version_id']}, byte_arrays=True)[0]:
+        entries = self._datastore.find({}, {'metadata': ['tree_id',
+                                                         'version_id']},
+                                       byte_arrays=True)[0]
+        for entry in entries:
 
             self._datastore.save(entry['tree_id'], entry['version_id'],
                 self._update_properties, content_file.name, False)
 
     def test_update_verify(self):
-        """Verify test_update() has changed content and metadata of all entries."""
+        """
+        Verify test_update() has changed content and metadata of all entries.
+        """
         for entry in self._datastore.find({}, {}, byte_arrays=True)[0]:
             filename = self._datastore.get_data(entry['tree_id'],
-                entry['version_id'], byte_arrays=True)
+                                                entry['version_id'],
+                                                byte_arrays=True)
             self._filter_properties(entry)
             try:
                 self.assertEquals(entry, self._update_properties)
diff --git a/tests/test_migration_v2_v3.py b/tests/test_migration_v2_v3.py
index bb7a8a0..73d07c6 100644
--- a/tests/test_migration_v2_v3.py
+++ b/tests/test_migration_v2_v3.py
@@ -2,18 +2,16 @@
 """Large number of operations intended for measuring performance."""
 
 import dbus
-import decorator
 import hashlib
 import os
-import tempfile
 import time
 import unittest
 import uuid
 
 
-DS_DBUS_SERVICE = "org.laptop.sugar.DataStore"
-DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore2"
-DS_DBUS_PATH = "/org/laptop/sugar/DataStore2"
+DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
+DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore2'
+DS_DBUS_PATH = '/org/laptop/sugar/DataStore2'
 IGNORE_PROPERTIES = [
     'activity_id',
     'checksum',
@@ -33,10 +31,10 @@ class MigrationV2V3TestCase(unittest.TestCase):
 
     def __init__(self, *args, **kwargs):
         unittest.TestCase.__init__(self, *args, **kwargs)
-        self._templates = self._v2_properties*10
+        self._templates = self._v2_properties * 10
 
     def setUp(self):
-        # pylint: disable-msg=C0103
+        # pylint: disable=C0103
         profile = os.environ.get('SUGAR_PROFILE', 'default')
         base_dir = os.path.join(os.path.expanduser('~'), '.sugar', profile)
         self._root_path = os.path.join(base_dir, 'datastore')
@@ -45,7 +43,8 @@ class MigrationV2V3TestCase(unittest.TestCase):
 
         self._bus = dbus.SessionBus()
         self._datastore = dbus.Interface(self._bus.get_object(DS_DBUS_SERVICE,
-            DS_DBUS_PATH), DS_DBUS_INTERFACE)
+                                                              DS_DBUS_PATH),
+                                         DS_DBUS_INTERFACE)
 
     _v2_properties = [
         {
@@ -62,8 +61,8 @@ class MigrationV2V3TestCase(unittest.TestCase):
             'keep': '1',
             'mime_type': 'text/html',
             'activity': 'org.sugarlabs.DataStoreTest2',
-            'activity_id': lambda *args: str(uuid.uuid4()),
-            'timestamp': lambda *args: time.time(),
+            'activity_id': lambda number_: str(uuid.uuid4()),
+            'timestamp': lambda number_: time.time(),
             'icon-color': '#00ff00,#0000ff',
             'buddies': '{}',
             'description': 'DS migration test object',
@@ -73,20 +72,20 @@ class MigrationV2V3TestCase(unittest.TestCase):
         {
             'title': lambda number: 'DS test object %d' % (number, ),
             'activity': 'org.sugarlabs.DataStoreTest3',
-            'activity_id': lambda *args: str(uuid.uuid4()),
-            'ctime': lambda *args: time.strftime('%Y-%m-%dT%H:%M:%S'),
+            'activity_id': lambda number_: str(uuid.uuid4()),
+            'ctime': lambda number_: time.strftime('%Y-%m-%dT%H:%M:%S'),
         },
         {
             'title': lambda number: 'DS test object %d' % (number, ),
             'activity': 'org.sugarlabs.DataStoreTest4',
-            'activity_id': lambda *args: str(uuid.uuid4()),
-            'mtime': lambda *args: time.strftime('%Y-%m-%dT%H:%M:%S'),
+            'activity_id': lambda number_: str(uuid.uuid4()),
+            'mtime': lambda number_: time.strftime('%Y-%m-%dT%H:%M:%S'),
         },
         {},
     ]
 
     def _v2_content(self, num):
-        return ('Foo bar %d\n' % (num, ))*1000
+        return ('Foo bar %d\n' % (num, )) * 1000
 
     def _create_v2_datastore(self):
         """Create a version 2 datastore."""
@@ -130,15 +129,16 @@ class MigrationV2V3TestCase(unittest.TestCase):
 
     def test_find_all(self):
         """Run find() to list all migrated entries."""
-        entries, count = self._datastore.find({}, {'metadata': ['tree_id']},
-            byte_arrays=True)
+        entries_, count = self._datastore.find({}, {'metadata': ['tree_id']},
+                                               byte_arrays=True)
         self.assertEquals(count, len(self._templates))
 
     def test_get_properties(self):
         """Run find() to retrieve and verify single entry for all entries."""
-        for entry in self._datastore.find({}, {'metadata': ['tree_id',
-            'version_id']}, byte_arrays=True)[0]:
-
+        entries = self._datastore.find({}, {'metadata': ['tree_id',
+                                                         'version_id']},
+                                       byte_arrays=True)[0]
+        for entry in entries:
             properties = self._datastore.find({'tree_id': entry['tree_id'],
                 'version_id': entry['version_id']}, {}, byte_arrays=True)[0][0]
             if 'number' not in properties:
@@ -146,7 +146,7 @@ class MigrationV2V3TestCase(unittest.TestCase):
 
             number = int(properties['number'])
             expected = self._fill_template(self._templates[number],
-                number)
+                                           number)
             expected['filesize'] = str(len(self._v2_content(number)))
             self._filter_properties(properties)
             self._filter_properties(expected)
@@ -154,11 +154,14 @@ class MigrationV2V3TestCase(unittest.TestCase):
 
     def test_get_data(self):
         """Run get_data() on all entries and verify content."""
-        for entry in self._datastore.find({}, {'metadata': ['number',
-            'tree_id', 'version_id']}, byte_arrays=True)[0]:
-
+        entries = self._datastore.find({}, {'metadata': ['number',
+                                                         'tree_id',
+                                                         'version_id']},
+                                       byte_arrays=True)[0]
+        for entry in entries:
             filename = self._datastore.get_data(entry['tree_id'],
-                entry['version_id'], byte_arrays=True)
+                                                entry['version_id'],
+                                                byte_arrays=True)
             content = file(filename).read()
             os.remove(filename)
             if 'number' not in entry:
@@ -178,6 +181,7 @@ class MigrationV2V3TestCase(unittest.TestCase):
 
 
 def suite():
-    test_suite = unittest.TestLoader().loadTestsFromTestCase(MigrationV2V3TestCase)
+    test_loader = unittest.TestLoader()
+    test_suite = test_loader.loadTestsFromTestCase(MigrationV2V3TestCase)
     test_suite.__doc__ = MigrationV2V3TestCase.__doc__
     return test_suite