tox fixes

Author: allmightyspiff

SoftLayer/utils.py

@@ -67,7 +67,7 @@ def dict_merge(dct1, dct2):
     """
 
     dct = dct1.copy()
-    for k, v in dct2.items():
+    for k, _ in dct2.items():
         if (k in dct1 and isinstance(dct1[k], dict) and isinstance(dct2[k], collections.Mapping)):
             dct[k] = dict_merge(dct1[k], dct2[k])
         else:

tests/basic_tests.py

@@ -80,17 +80,15 @@ def test_timezone(self):
         self.assertEqual(datetime.timedelta(0), time.utcoffset())
 
     def test_dict_merge(self):
-        filter1 = {"virtualGuests":{"hostname":{"operation":"etst"}}}
-        filter2 = {"virtualGuests":{"id":{"operation":"orderBy","options":[{"name":"sort","value":["DESC"]}]}}}
+        filter1 = {"virtualGuests": {"hostname": {"operation": "etst"}}}
+        filter2 = {"virtualGuests": {"id": {"operation": "orderBy", "options": [{"name": "sort", "value": ["DESC"]}]}}}
         result = SoftLayer.utils.dict_merge(filter1, filter2)
 
         self.assertEqual(result['virtualGuests']['id']['operation'], 'orderBy')
         self.assertNotIn('id', filter1['virtualGuests'])
         self.assertEqual(result['virtualGuests']['hostname']['operation'], 'etst')
 
 
-
-
 class TestNestedDict(testing.TestCase):
 
     def test_basic(self):