flake8 happy

Author: iolsen

backup.py

@@ -1,7 +1,6 @@
 from fileupload import FileUpload
 from inventory import Inventory
 import boto3
-import botocore
 import cli
 import json
 import yaml
@@ -10,6 +9,7 @@
 config = yaml.safe_load(open('config.yaml'))
 client = boto3.client('glacier')
 
+
 def upload_file(filePath):
     file_upload = FileUpload(config['vaultName'], filePath)
     cli.pp(file_upload.upload(client))
@@ -50,7 +50,8 @@ def sync(vaultName):
 
 # perform_inventory(config['vaultName'])
 # list_jobs(config['vaultName'])
-# fetch_inventory(config['vaultName'], '-YDD4AVvtcn6rn7zEYz8SF2HzNdLqqIhRnduONtSTz40jOBfAvIvycrfGJNijSefJHDS8D8A9tOCNxv6akFckF81Z493')
+# fetch_inventory(config['vaultName'],
+# '-YDD4AVvtcn6rn7zEYz8SF2HzNdLqqIhRnduONtSTz40jOBfAvIvycrfGJNijSefJHDS8D8A9tOCNxv6akFckF81Z493')
 
 upload_file(config['filePath'])
 

cli.py

@@ -3,9 +3,11 @@
 import sys
 import time
 
+
 def get_console_dimensions():
     return os.popen('stty size', 'r').read().split()
 
+
 def format_timespan(seconds):
     m, s = divmod(seconds, 60)
     h, m = divmod(m, 60)
@@ -14,7 +16,7 @@ def format_timespan(seconds):
 
 def format_filesize(bytes, decimal_digits=1):
     format_str = "%." + str(decimal_digits) + "f %sB"
-    for unit in ['','K','M','G','T','P','E','Z']:
+    for unit in ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z']:
         if abs(bytes) < 1024.0:
             return format_str % (bytes, unit)
         bytes /= 1024.0

fileupload.py

@@ -4,6 +4,7 @@
 import os
 import time
 
+
 class FileUpload:
 
     def __init__(self, vaultName, filePath):
@@ -14,19 +15,16 @@ def __init__(self, vaultName, filePath):
         self._partSize = get_best_part_size(self._fileSizeBytes)
         self._partNumUploading = 0
 
-
     def formattedFileSize(self):
         if not hasattr(self, '_formattedFileSize'):
             self._formattedFileSize = cli.format_filesize(self._fileSizeBytes)
         return self._formattedFileSize
 
-
     def formattedPartSize(self):
         if not hasattr(self, '_formattedPartSize'):
             self._formattedPartSize = cli.format_filesize(self._partSize, 0)
         return self._formattedPartSize
 
-
     def upload(self, client):
 
         self._upload = client.initiate_multipart_upload(
@@ -59,31 +57,31 @@ def upload(self, client):
             checksum=treehash.hexdigest())
 
         cli.cli_progress(self._fileName,
-            self.formattedFileSize(),
-            self.formattedPartSize(),
-            self._startTime,
-            self._fileSizeBytes-1,
-            self._fileSizeBytes-1)
+                         self.formattedFileSize(),
+                         self.formattedPartSize(),
+                         self._startTime,
+                         self._fileSizeBytes-1,
+                         self._fileSizeBytes-1)
 
         return response
 
-
     def _upload_part(self,
                      client,
                      part,
                      partBegin,
                      partEnd):
 
         cli.cli_progress(self._fileName,
-            self.formattedFileSize(),
-            self.formattedPartSize(),
-            self._startTime,
-            partBegin,
-            self._fileSizeBytes-1)
+                         self.formattedFileSize(),
+                         self.formattedPartSize(),
+                         self._startTime,
+                         partBegin,
+                         self._fileSizeBytes-1)
 
         for upload_attempt in range(0, 2):
             # print 'Uploading bytes %d through %d (%d%%)...' % (
-            #     partBegin, partEnd, float(partEnd)/(self._fileSizeBytes-1)*100)
+            #     partBegin, partEnd,
+            #     float(partEnd)/(self._fileSizeBytes-1)*100)
             try:
                 response = client.upload_multipart_part(
                     vaultName=self._vaultName,
@@ -97,6 +95,7 @@ def _upload_part(self,
 
             print "\nFAILED"
 
+
 def get_best_part_size(fileSizeBytes):
     # We want the smallest possible part size. Maximum parts is 10,000.
     # So we find the first part size larger than file_len/10,000.

inventory.py

@@ -2,6 +2,7 @@
 import os
 from enum import Enum
 
+
 class Inventory:
 
     _FILENAME = 'pyback_inventory.json'
@@ -18,21 +19,18 @@ def __init__(self, dir_path):
         contents_list = os.listdir(dir_path)
         for entry in contents_list:
             if (os.path.isfile(os.path.join(dir_path, entry))
-            and entry not in self._entries):
+                    and entry not in self._entries):
                 self._entries[entry] = {
                     u'state': FileState.NEW
                 }
 
-
     def save(self):
         with open(self.file_path, 'w') as outfile:
             json.dump(self._entries, outfile, cls=EnumEncoder)
 
-
     def set_state(self, fileName, new_state):
         self._entries[fileName]['state'] = new_state
 
-
     def get_state(self, fileName):
         return self._entries[fileName]['state']
 
@@ -42,7 +40,8 @@ class FileState(Enum):
     NEW = 0
     IN_PROGRESS = 1
     UPLOADED = 2
-    VERIFIED = 3 # Appears in an inventory
+    VERIFIED = 3  # Appears in an inventory
+
 
 # Stolen from
 # http://stackoverflow.com/questions/24481852/serialising-an-enum-member-to-json
@@ -52,6 +51,7 @@ def default(self, obj):
             return {"__enum__": str(obj)}
         return json.JSONEncoder.default(self, obj)
 
+
 def as_enum(d):
     if "__enum__" in d:
         name, member = d["__enum__"].split(".")