Merge "Bump hacking"

Author: Zuul

doc/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.
 sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
 reno>=3.1.0 # Apache-2.0

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
 PrettyTable>=0.7.2 # BSD
 requests>=2.14.2 # Apache-2.0

test-requirements.txt

@@ -1,7 +1,4 @@
-# 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.
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0

troveclient/osc/v1/database_flavors.py

@@ -23,12 +23,12 @@ def set_attributes_for_print_detail(flavor):
     info = flavor._info.copy()
     # Get rid of those ugly links
     if info.get('links'):
-        del(info['links'])
+        del info['links']
 
     # Fallback to str_id for flavors, where necessary
     if hasattr(flavor, 'str_id'):
         info['id'] = flavor.id
-        del(info['str_id'])
+        del info['str_id']
     return info
 
 

troveclient/osc/v1/database_logs.py

@@ -37,8 +37,8 @@ def take_action(self, parsed_args):
         instance = osc_utils.find_resource(database_instances,
                                            parsed_args.instance)
         log_list = database_instances.log_list(instance)
-        logs = [osc_utils.get_item_properties(l, self.columns)
-                for l in log_list]
+        logs = [osc_utils.get_item_properties(log, self.columns)
+                for log in log_list]
         return self.columns, logs
 
 

troveclient/v1/shell.py

@@ -141,12 +141,12 @@ def _print_cluster(cluster, include_all=False):
 def _print_object(obj):
     # Get rid of those ugly links
     if obj._info.get('links'):
-        del(obj._info['links'])
+        del obj._info['links']
 
     # Fallback to str_id for flavors, where necessary
     if hasattr(obj, 'str_id'):
         obj._info['id'] = obj.id
-        del(obj._info['str_id'])
+        del obj._info['str_id']
 
     # Get datastore type and version, where necessary
     if hasattr(obj, 'datastore'):