Merge "Bump hacking"

requirements.txt

@@ -1,6 +1,3 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 alembic>=0.9.6 # MIT

test-requirements.txt

@@ -1,8 +1,4 @@
-# The order of packages is significant, because pip processes them in the order
+hacking>=6.1.0,<6.2.0 # Apache-2.0
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-# Metrics and style
-hacking>=3.0.1,<3.1.0 # Apache-2.0
 
 # Backends
 redis>=3.0.0 # MIT

zaqar/storage/mongodb/utils.py

@@ -301,14 +301,14 @@ def retries_on_autoreconnect(func):
                 break
 
             except errors.AutoReconnect as ex:
-                LOG.warning(u'Caught AutoReconnect, retrying the '
+                LOG.warning('Caught AutoReconnect, retrying the '
-                            'call to {0}'.format(func))
+                            'call to %s', func.__name__)
 
                 last_ex = ex
                 time.sleep(sleep_sec * (2 ** attempt))
         else:
-            LOG.error(u'Caught AutoReconnect, maximum attempts '
+            LOG.error('Caught AutoReconnect, maximum attempts '
-                      'to {0} exceeded.'.format(func))
+                      'to %s exceeded.', func.__name__)
 
             raise last_ex
 

zaqar/storage/redis/utils.py

@@ -203,13 +203,13 @@ def retries_on_connection_error(func):
                 # MasterNotFoundError.
 
                 ex = sys.exc_info()[1]
-                LOG.warning(u'Caught ConnectionError, retrying the '
+                LOG.warning('Caught ConnectionError, retrying the '
-                            'call to {0}'.format(func))
+                            'call to %s', func.__name__)
 
                 time.sleep(sleep_sec * (2 ** attempt))
         else:
-            LOG.error(u'Caught ConnectionError, maximum attempts '
+            LOG.error('Caught ConnectionError, maximum attempts '
-                      'to {0} exceeded.'.format(func))
+                      'to %s exceeded.', func.__name__)
             raise ex
 
     return wrapper

zaqar/tests/unit/storage/sqlalchemy_migration/test_migrations_base.py

@@ -83,8 +83,8 @@ class BaseWalkMigrationTestCase(object):
 
         getattr(command, alembic_command)(*args, **kwargs)
         res = buf.getvalue().strip()
-        LOG.debug('Alembic command {command} returns: {result}'.format(
+        LOG.debug('Alembic command {command} returns: {result}',
-                  command=alembic_command, result=res))
+                  {'command': alembic_command, 'result': res})
 
         return res
 
@@ -160,7 +160,7 @@ class BaseWalkMigrationTestCase(object):
                     check(engine, data)
         except Exception:
             LOG.error("Failed to migrate to version {version} on engine "
-                      "{engine}".format(version=version, engine=engine))
+                      "{engine}", {'version': version, 'engine': engine})
             raise
 
 

zaqar/tests/unit/transport/wsgi/v2_0/test_flavors_new.py

@@ -266,7 +266,7 @@ class TestFlavorsMongoDB(base.V2Base):
         self.simulate_delete(self.flavor_path)
         query = 'limit={0}&detailed={1}'.format(limit, detailed)
         if marker:
-            query += '&marker={2}'.format(marker)
+            query += '&marker={0}'.format(marker)
 
         with flavors(self, count):
             result = self.simulate_get(self.url_prefix + '/flavors',

zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py

@@ -186,7 +186,7 @@ class TestSubscriptionsMongoDB(base.V2Base):
 
         query = 'limit={0}'.format(limit)
         if marker:
-            query += '&marker={1}'.format(marker)
+            query += '&marker={0}'.format(marker)
 
         resp = self.simulate_get(self.subscription_path,
                                  query_string=query,