Merge pull request #2469 from felixonmars/glacier-tidy

PEP8 fixes for Glacier. Fixes #2469.

6 files changed, 77 insertions, 82 deletions

diff --git a/tests/integration/glacier/test_layer1.py b/tests/integration/glacier/test_layer1.py
index effb5628..0d38da27 100644
--- a/tests/integration/glacier/test_layer1.py
+++ b/tests/integration/glacier/test_layer1.py
@@ -36,7 +36,7 @@ class TestGlacierLayer1(unittest.TestCase):
         glacier = Layer1()
         glacier.create_vault('l1testvault')
         self.addCleanup(glacier.delete_vault, 'l1testvault')
-        upload_id = glacier.initiate_multipart_upload('l1testvault', 4*1024*1024,
+        upload_id = glacier.initiate_multipart_upload('l1testvault', 4 * 1024 * 1024,
                                                       'double  spaces  here')['UploadId']
         self.addCleanup(glacier.abort_multipart_upload, 'l1testvault', upload_id)
         response = glacier.list_multipart_uploads('l1testvault')['UploadsList']
diff --git a/tests/unit/glacier/test_job.py b/tests/unit/glacier/test_job.py
index ac47ad8d..c7b7b1fb 100644
--- a/tests/unit/glacier/test_job.py
+++ b/tests/unit/glacier/test_job.py
@@ -56,7 +56,7 @@ class TestJob(unittest.TestCase):
             self.job.get_output(byte_range=(1, 1024), validate_checksum=False)
 
     def test_download_to_fileobj(self):
-        http_response=mock.Mock(read=mock.Mock(return_value='xyz'))
+        http_response = mock.Mock(read=mock.Mock(return_value='xyz'))
         response = GlacierResponse(http_response, None)
         response['TreeHash'] = 'tree_hash'
         self.api.get_job_output.return_value = response
diff --git a/tests/unit/glacier/test_layer1.py b/tests/unit/glacier/test_layer1.py
index 1e6490bf..4c8f0cf7 100644
--- a/tests/unit/glacier/test_layer1.py
+++ b/tests/unit/glacier/test_layer1.py
@@ -76,7 +76,7 @@ class GlacierJobOperations(GlacierLayer1ConnectionBase):
         self.set_http_response(status_code=200, header=header,
                                body=self.job_content)
         response = self.service_connection.get_job_output(self.vault_name,
-                                                         'example-job-id')
+                                                          'example-job-id')
         self.assertEqual(self.job_content, response.read())
 
 
diff --git a/tests/unit/glacier/test_layer2.py b/tests/unit/glacier/test_layer2.py
index eec175d3..84b53aac 100644
--- a/tests/unit/glacier/test_layer2.py
+++ b/tests/unit/glacier/test_layer2.py
@@ -32,73 +32,71 @@ import boto.glacier.vault
 from boto.glacier.vault import Vault
 from boto.glacier.vault import Job
 
-from boto.compat import StringIO
-
 from datetime import datetime, tzinfo, timedelta
 
 # Some fixture data from the Glacier docs
 FIXTURE_VAULT = {
-  "CreationDate" : "2012-02-20T17:01:45.198Z",
-  "LastInventoryDate" : "2012-03-20T17:03:43.221Z",
-  "NumberOfArchives" : 192,
-  "SizeInBytes" : 78088912,
-  "VaultARN" : "arn:aws:glacier:us-east-1:012345678901:vaults/examplevault",
-  "VaultName" : "examplevault"
+    "CreationDate": "2012-02-20T17:01:45.198Z",
+    "LastInventoryDate": "2012-03-20T17:03:43.221Z",
+    "NumberOfArchives": 192,
+    "SizeInBytes": 78088912,
+    "VaultARN": "arn:aws:glacier:us-east-1:012345678901:vaults/examplevault",
+    "VaultName": "examplevault"
 }
 
 FIXTURE_VAULTS = {
-        'RequestId': 'vuXO7SHTw-luynJ0Zu31AYjR3TcCn7X25r7ykpuulxY2lv8',
-        'VaultList': [{'SizeInBytes': 0, 'LastInventoryDate': None,
-                       'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault0',
-                       'VaultName': 'vault0', 'NumberOfArchives': 0,
-                       'CreationDate': '2013-05-17T02:38:39.049Z'},
-                      {'SizeInBytes': 0, 'LastInventoryDate': None,
-                       'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault3',
-                       'VaultName': 'vault3', 'NumberOfArchives': 0,
-                       'CreationDate': '2013-05-17T02:31:18.659Z'}]}
+    'RequestId': 'vuXO7SHTw-luynJ0Zu31AYjR3TcCn7X25r7ykpuulxY2lv8',
+    'VaultList': [{'SizeInBytes': 0, 'LastInventoryDate': None,
+                   'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault0',
+                   'VaultName': 'vault0', 'NumberOfArchives': 0,
+                   'CreationDate': '2013-05-17T02:38:39.049Z'},
+                  {'SizeInBytes': 0, 'LastInventoryDate': None,
+                   'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault3',
+                   'VaultName': 'vault3', 'NumberOfArchives': 0,
+                   'CreationDate': '2013-05-17T02:31:18.659Z'}]}
 
 FIXTURE_PAGINATED_VAULTS = {
-        'Marker': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault2',
-        'RequestId': 'vuXO7SHTw-luynJ0Zu31AYjR3TcCn7X25r7ykpuulxY2lv8',
-        'VaultList': [{'SizeInBytes': 0, 'LastInventoryDate': None,
-                       'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault0',
-                       'VaultName': 'vault0', 'NumberOfArchives': 0,
-                       'CreationDate': '2013-05-17T02:38:39.049Z'},
-                      {'SizeInBytes': 0, 'LastInventoryDate': None,
-                       'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault1',
-                       'VaultName': 'vault1', 'NumberOfArchives': 0,
-                       'CreationDate': '2013-05-17T02:31:18.659Z'}]}
+    'Marker': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault2',
+    'RequestId': 'vuXO7SHTw-luynJ0Zu31AYjR3TcCn7X25r7ykpuulxY2lv8',
+    'VaultList': [{'SizeInBytes': 0, 'LastInventoryDate': None,
+                   'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault0',
+                   'VaultName': 'vault0', 'NumberOfArchives': 0,
+                   'CreationDate': '2013-05-17T02:38:39.049Z'},
+                  {'SizeInBytes': 0, 'LastInventoryDate': None,
+                   'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault1',
+                   'VaultName': 'vault1', 'NumberOfArchives': 0,
+                   'CreationDate': '2013-05-17T02:31:18.659Z'}]}
 FIXTURE_PAGINATED_VAULTS_CONT = {
-        'Marker': None,
-        'RequestId': 'vuXO7SHTw-luynJ0Zu31AYjR3TcCn7X25r7ykpuulxY2lv8',
-        'VaultList': [{'SizeInBytes': 0, 'LastInventoryDate': None,
-                       'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault2',
-                       'VaultName': 'vault2', 'NumberOfArchives': 0,
-                       'CreationDate': '2013-05-17T02:38:39.049Z'},
-                      {'SizeInBytes': 0, 'LastInventoryDate': None,
-                       'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault3',
-                       'VaultName': 'vault3', 'NumberOfArchives': 0,
-                       'CreationDate': '2013-05-17T02:31:18.659Z'}]}
+    'Marker': None,
+    'RequestId': 'vuXO7SHTw-luynJ0Zu31AYjR3TcCn7X25r7ykpuulxY2lv8',
+    'VaultList': [{'SizeInBytes': 0, 'LastInventoryDate': None,
+                   'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault2',
+                   'VaultName': 'vault2', 'NumberOfArchives': 0,
+                   'CreationDate': '2013-05-17T02:38:39.049Z'},
+                  {'SizeInBytes': 0, 'LastInventoryDate': None,
+                   'VaultARN': 'arn:aws:glacier:us-east-1:686406519478:vaults/vault3',
+                   'VaultName': 'vault3', 'NumberOfArchives': 0,
+                   'CreationDate': '2013-05-17T02:31:18.659Z'}]}
 
 FIXTURE_ARCHIVE_JOB = {
-  "Action": "ArchiveRetrieval",
-  "ArchiveId": ("NkbByEejwEggmBz2fTHgJrg0XBoDfjP4q6iu87-TjhqG6eGoOY9Z8i1_AUyUs"
-                "uhPAdTqLHy8pTl5nfCFJmDl2yEZONi5L26Omw12vcs01MNGntHEQL8MBfGlqr"
-                "EXAMPLEArchiveId"),
-  "ArchiveSizeInBytes": 16777216,
-  "Completed": False,
-  "CreationDate": "2012-05-15T17:21:39.339Z",
-  "CompletionDate": "2012-05-15T17:21:43.561Z",
-  "InventorySizeInBytes": None,
-  "JobDescription": "My ArchiveRetrieval Job",
-  "JobId": ("HkF9p6o7yjhFx-K3CGl6fuSm6VzW9T7esGQfco8nUXVYwS0jlb5gq1JZ55yHgt5v"
-            "P54ZShjoQzQVVh7vEXAMPLEjobID"),
-  "SHA256TreeHash": ("beb0fe31a1c7ca8c6c04d574ea906e3f97b31fdca7571defb5b44dc"
-                     "a89b5af60"),
-  "SNSTopic": "arn:aws:sns:us-east-1:012345678901:mytopic",
-  "StatusCode": "InProgress",
-  "StatusMessage": "Operation in progress.",
-  "VaultARN": "arn:aws:glacier:us-east-1:012345678901:vaults/examplevault"
+    "Action": "ArchiveRetrieval",
+    "ArchiveId": ("NkbByEejwEggmBz2fTHgJrg0XBoDfjP4q6iu87-TjhqG6eGoOY9Z8i1_AUyUs"
+                  "uhPAdTqLHy8pTl5nfCFJmDl2yEZONi5L26Omw12vcs01MNGntHEQL8MBfGlqr"
+                  "EXAMPLEArchiveId"),
+    "ArchiveSizeInBytes": 16777216,
+    "Completed": False,
+    "CreationDate": "2012-05-15T17:21:39.339Z",
+    "CompletionDate": "2012-05-15T17:21:43.561Z",
+    "InventorySizeInBytes": None,
+    "JobDescription": "My ArchiveRetrieval Job",
+    "JobId": ("HkF9p6o7yjhFx-K3CGl6fuSm6VzW9T7esGQfco8nUXVYwS0jlb5gq1JZ55yHgt5v"
+              "P54ZShjoQzQVVh7vEXAMPLEjobID"),
+    "SHA256TreeHash": ("beb0fe31a1c7ca8c6c04d574ea906e3f97b31fdca7571defb5b44dc"
+                       "a89b5af60"),
+    "SNSTopic": "arn:aws:sns:us-east-1:012345678901:mytopic",
+    "StatusCode": "InProgress",
+    "StatusMessage": "Operation in progress.",
+    "VaultARN": "arn:aws:glacier:us-east-1:012345678901:vaults/examplevault"
 }
 
 EXAMPLE_PART_LIST_RESULT_PAGE_1 = {
@@ -107,11 +105,10 @@ EXAMPLE_PART_LIST_RESULT_PAGE_1 = {
     "Marker": "MfgsKHVjbQ6EldVl72bn3_n5h2TaGZQUO-Qb3B9j3TITf7WajQ",
     "MultipartUploadId": "OW2fM5iVylEpFEMM9_HpKowRapC3vn5sSL39_396UW9zLFUWVrnRHaPjUJddQ5OxSHVXjYtrN47NBZ-khxOjyEXAMPLE",
     "PartSizeInBytes": 4194304,
-    "Parts":
-    [ {
-      "RangeInBytes": "4194304-8388607",
-      "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
-      }],
+    "Parts": [{
+        "RangeInBytes": "4194304-8388607",
+        "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
+    }],
     "VaultARN": "arn:aws:glacier:us-east-1:012345678901:vaults/demo1-vault"
 }
 
@@ -123,11 +120,10 @@ EXAMPLE_PART_LIST_RESULT_PAGE_2 = {
     "Marker": None,
     "MultipartUploadId": None,
     "PartSizeInBytes": None,
-    "Parts":
-    [ {
-      "RangeInBytes": "0-4194303",
-      "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
-      }],
+    "Parts": [{
+        "RangeInBytes": "0-4194303",
+        "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
+    }],
     "VaultARN": None
 }
 
@@ -137,14 +133,13 @@ EXAMPLE_PART_LIST_COMPLETE = {
     "Marker": None,
     "MultipartUploadId": "OW2fM5iVylEpFEMM9_HpKowRapC3vn5sSL39_396UW9zLFUWVrnRHaPjUJddQ5OxSHVXjYtrN47NBZ-khxOjyEXAMPLE",
     "PartSizeInBytes": 4194304,
-    "Parts":
-    [ {
-      "RangeInBytes": "4194304-8388607",
-      "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
+    "Parts": [{
+        "RangeInBytes": "4194304-8388607",
+        "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
     }, {
-      "RangeInBytes": "0-4194303",
-      "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
-      }],
+        "RangeInBytes": "0-4194303",
+        "SHA256TreeHash": "01d34dabf7be316472c93b1ef80721f5d4"
+    }],
     "VaultARN": "arn:aws:glacier:us-east-1:012345678901:vaults/demo1-vault"
 }
 
@@ -183,7 +178,7 @@ class TestGlacierLayer2Connection(GlacierLayer2Base):
         def return_paginated_vaults_resp(marker=None, limit=None):
             return resps.pop(0)
 
-        self.mock_layer1.list_vaults = Mock(side_effect = return_paginated_vaults_resp)
+        self.mock_layer1.list_vaults = Mock(side_effect=return_paginated_vaults_resp)
         vaults = self.layer2.list_vaults()
         self.assertEqual(vaults[0].name, "vault0")
         self.assertEqual(vaults[3].name, "vault3")
@@ -287,11 +282,11 @@ class TestVault(GlacierLayer2Base):
             'Parts': [{
                 'RangeInBytes': '0-3',
                 'SHA256TreeHash': '12',
-                }, {
+            }, {
                 'RangeInBytes': '4-6',
                 'SHA256TreeHash': '34',
-                },
-        ]}
+            }],
+        }
 
         self.vault.list_all_parts = mock_list_parts
         self.vault.resume_archive_from_file(
@@ -315,6 +310,7 @@ class TestJob(GlacierLayer2Base):
             "HkF9p6o7yjhFx-K3CGl6fuSm6VzW9T7esGQfco8nUXVYwS0jlb5gq1JZ55yHgt5vP"
             "54ZShjoQzQVVh7vEXAMPLEjobID", (0, 100))
 
+
 class TestRangeStringParsing(unittest.TestCase):
     def test_simple_range(self):
         self.assertEquals(
diff --git a/tests/unit/glacier/test_vault.py b/tests/unit/glacier/test_vault.py
index 68d9d784..b17a3eee 100644
--- a/tests/unit/glacier/test_vault.py
+++ b/tests/unit/glacier/test_vault.py
@@ -69,7 +69,7 @@ class TestVault(unittest.TestCase):
         # The write should be created with the default part size of the
         # instance (2 MB).
         self.vault.create_archive_writer.assert_called_with(
-                description=mock.ANY, part_size=self.vault.DefaultPartSize)
+            description=mock.ANY, part_size=self.vault.DefaultPartSize)
 
     def test_large_part_size_is_obeyed(self):
         self.vault.DefaultPartSize = 8 * 1024 * 1024
diff --git a/tests/unit/glacier/test_writer.py b/tests/unit/glacier/test_writer.py
index c7066b97..b2875f3c 100644
--- a/tests/unit/glacier/test_writer.py
+++ b/tests/unit/glacier/test_writer.py
@@ -27,7 +27,6 @@ from tests.unit import unittest
 from mock import (
     call,
     Mock,
-    patch,
     sentinel,
 )
 from nose.tools import assert_equal
@@ -50,7 +49,7 @@ def create_mock_vault():
 def partify(data, part_size):
     for i in itertools.count(0):
         start = i * part_size
-        part = data[start:start+part_size]
+        part = data[start:start + part_size]
         if part:
             yield part
         else: