Merge pull request #20 from spulec/master

Merge upstream

.travis.yml

@@ -54,7 +54,7 @@ deploy:
     on:
       branch:
       - master
-    cleanup: false
+    skip_cleanup: true
     skip_existing: true
   # - provider: pypi
   #   distributions: sdist bdist_wheel

moto/batch/models.py

@@ -302,9 +302,7 @@ class Job(threading.Thread, BaseModel):
         self.job_id = str(uuid.uuid4())
         self.job_definition = job_def
         self.job_queue = job_queue
-        self.job_state = (
-            "SUBMITTED"
-        )  # One of SUBMITTED | PENDING | RUNNABLE | STARTING | RUNNING | SUCCEEDED | FAILED
+        self.job_state = "SUBMITTED"  # One of SUBMITTED | PENDING | RUNNABLE | STARTING | RUNNING | SUCCEEDED | FAILED
         self.job_queue.jobs.append(self)
         self.job_started_at = datetime.datetime(1970, 1, 1)
         self.job_stopped_at = datetime.datetime(1970, 1, 1)

moto/cloudformation/responses.py

@@ -177,9 +177,7 @@ class CloudFormationResponse(BaseResponse):
             start = stack_ids.index(token) + 1
         else:
             start = 0
-        max_results = (
-            50
-        )  # using this to mske testing of paginated stacks more convenient than default 1 MB
+        max_results = 50  # using this to mske testing of paginated stacks more convenient than default 1 MB
         stacks_resp = stacks[start : start + max_results]
         next_token = None
         if len(stacks) > (start + max_results):

moto/iam/models.py

@@ -788,9 +788,7 @@ class AccountSummary(BaseModel):
         self._groups_per_user_quota = 10
         self._attached_policies_per_user_quota = 10
         self._policies_quota = 1500
-        self._account_mfa_enabled = (
-            0
-        )  # Haven't found any information being able to activate MFA for the root account programmatically
+        self._account_mfa_enabled = 0  # Haven't found any information being able to activate MFA for the root account programmatically
         self._access_keys_per_user_quota = 2
         self._assume_role_policy_size_quota = 2048
         self._policy_versions_in_use_quota = 10000

moto/iam/policy_validation.py

@@ -88,9 +88,7 @@ class IAMPolicyDocumentValidator:
         self._policy_document = policy_document
         self._policy_json = {}
         self._statements = []
-        self._resource_error = (
-            ""
-        )  # the first resource error found that does not generate a legacy parsing error
+        self._resource_error = ""  # the first resource error found that does not generate a legacy parsing error
 
     def validate(self):
         try:

tests/test_ecs/test_ecs_boto3.py

@@ -1924,9 +1924,7 @@ def test_attributes():
     )
     attrs = resp["attributes"]
 
-    NUM_CUSTOM_ATTRIBUTES = (
-        4
-    )  # 2 specific to individual machines and 1 global, going to both machines (2 + 1*2)
+    NUM_CUSTOM_ATTRIBUTES = 4  # 2 specific to individual machines and 1 global, going to both machines (2 + 1*2)
     NUM_DEFAULT_ATTRIBUTES = 4
     len(attrs).should.equal(
         NUM_CUSTOM_ATTRIBUTES + (NUM_DEFAULT_ATTRIBUTES * len(instances))