diff --git a/parsedmarc/s3.py b/parsedmarc/s3.py index 8f64aa0..41910ed 100644 --- a/parsedmarc/s3.py +++ b/parsedmarc/s3.py @@ -28,23 +28,23 @@ class S3Client(object): "begin_date", "end_date", ] - + self.s3 = boto3.resource('s3') self.bucket = self.s3.Bucket(self.bucket_name) - def save_aggregate_report_to_s3(self, report): self.save_report_to_s3(report, 'aggregate') - def save_forensic_report_to_s3(self, report): self.save_report_to_s3(report, 'forensic') - def save_report_to_s3(self, report, report_type): - report_date = human_timestamp_to_datetime(report["report_metadata"]["begin_date"]) + report_date = human_timestamp_to_datetime( + report["report_metadata"]["begin_date"] + ) report_id = report["report_metadata"]["report_id"] - object_path = "{0}/{1}/year={2}/month={3:02d}/day={4:02d}/{5}.json".format( + path_template = "{0}/{1}/year={2}/month={3:02d}/day={4:02d}/{5}.json" + object_path = path_template.format( self.bucket_path, report_type, report_date.year, @@ -52,7 +52,10 @@ class S3Client(object): report_date.day, report_id ) - logger.debug("Saving {0} report to s3://{1}/{2}".format(report_type, self.bucket_name, object_path)) + logger.debug("Saving {0} report to s3://{1}/{2}".format( + report_type, + self.bucket_name, + object_path)) object_metadata = { k: v for k, v in report["report_metadata"].items()