Merge branch 'master' of https://github.com/spulec/moto

moto/core/responses.py

@@ -307,7 +307,7 @@ class BaseResponse(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
         def _convert(elem, is_last):
             if not re.match("^{.*}$", elem):
                 return elem
-            name = elem.replace("{", "").replace("}", "")
+            name = elem.replace("{", "").replace("}", "").replace("+", "")
             if is_last:
                 return "(?P<%s>[^/]*)" % name
             return "(?P<%s>.*)" % name

moto/datasync/responses.py

@@ -153,7 +153,7 @@ class DataSyncResponse(BaseResponse):
         task_execution_arn = self._get_param("TaskExecutionArn")
         task_execution = self.datasync_backend._get_task_execution(task_execution_arn)
         result = json.dumps(
-            {"TaskExecutionArn": task_execution.arn, "Status": task_execution.status,}
+            {"TaskExecutionArn": task_execution.arn, "Status": task_execution.status}
         )
         if task_execution.status == "SUCCESS":
             self.datasync_backend.tasks[task_execution.task_arn].status = "AVAILABLE"

moto/datasync/urls.py

@@ -4,6 +4,4 @@ from .responses import DataSyncResponse
 
 url_bases = ["https?://(.*?)(datasync)(.*?).amazonaws.com"]
 
-url_paths = {
-    "{0}/$": DataSyncResponse.dispatch,
-}
+url_paths = {"{0}/$": DataSyncResponse.dispatch}

moto/events/models.py

@@ -316,8 +316,7 @@ class EventsBackend(BaseBackend):
 
         if not event_bus:
             raise JsonRESTError(
-                "ResourceNotFoundException",
-                "Event bus {} does not exist.".format(name),
+                "ResourceNotFoundException", "Event bus {} does not exist.".format(name)
             )
 
         return event_bus

moto/events/responses.py

@@ -261,10 +261,7 @@ class EventsHandler(BaseResponse):
         name = self._get_param("Name")
 
         event_bus = self.events_backend.describe_event_bus(name)
-        response = {
-            "Name": event_bus.name,
-            "Arn": event_bus.arn,
-        }
+        response = {"Name": event_bus.name, "Arn": event_bus.arn}
 
         if event_bus.policy:
             response["Policy"] = event_bus.policy
@@ -285,10 +282,7 @@ class EventsHandler(BaseResponse):
 
         response = []
         for event_bus in self.events_backend.list_event_buses(name_prefix):
-            event_bus_response = {
-                "Name": event_bus.name,
-                "Arn": event_bus.arn,
-            }
+            event_bus_response = {"Name": event_bus.name, "Arn": event_bus.arn}
 
             if event_bus.policy:
                 event_bus_response["Policy"] = event_bus.policy