Merge pull request #354 from silveregg/0.4.1-threadsafe

threadsafe fix

moto/autoscaling/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': AutoScalingResponse().dispatch,
+    '{0}/$': AutoScalingResponse.dispatch,
 }

moto/cloudformation/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': CloudFormationResponse().dispatch,
+    '{0}/$': CloudFormationResponse.dispatch,
 }

moto/cloudwatch/urls.py

@@ -5,5 +5,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': CloudWatchResponse().dispatch,
+    '{0}/$': CloudWatchResponse.dispatch,
 }

moto/core/responses.py

@@ -82,7 +82,11 @@ class BaseResponse(_TemplateEnvironmentMixin):
     default_region = 'us-east-1'
     region_regex = r'\.(.+?)\.amazonaws\.com'
 
-    def dispatch(self, request, full_url, headers):
+    @classmethod
+    def dispatch(cls, *args, **kwargs):
+        return cls()._dispatch(*args, **kwargs)
+
+    def _dispatch(self, request, full_url, headers):
         querystring = {}
 
         if hasattr(request, 'body'):

moto/dynamodb/urls.py

@@ -7,5 +7,5 @@ url_bases = [
 ]
 
 url_paths = {
-    "{0}/": DynamoHandler().dispatch,
+    "{0}/": DynamoHandler.dispatch,
 }

moto/dynamodb2/models.py

@@ -240,7 +240,7 @@ class Table(object):
         results = []
         last_page = True  # Once pagination is implemented, change this
 
-        possible_results = [item for item in list(self.all_items()) if item.hash_key == hash_key]
+        possible_results = [item for item in list(self.all_items()) if isinstance(item, Item) and item.hash_key == hash_key]
         if range_comparison:
             for result in possible_results:
                 if result.range_key.compare(range_comparison, range_objs):

moto/dynamodb2/urls.py

@@ -7,5 +7,5 @@ url_bases = [
 ]
 
 url_paths = {
-    "{0}/": DynamoHandler().dispatch,
+    "{0}/": DynamoHandler.dispatch,
 }

moto/ec2/urls.py

@@ -7,5 +7,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/': EC2Response().dispatch,
+    '{0}/': EC2Response.dispatch,
 }

moto/elb/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': ELBResponse().dispatch,
+    '{0}/$': ELBResponse.dispatch,
 }

moto/emr/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': ElasticMapReduceResponse().dispatch,
+    '{0}/$': ElasticMapReduceResponse.dispatch,
 }

moto/iam/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': IamResponse().dispatch,
+    '{0}/$': IamResponse.dispatch,
 }

moto/kinesis/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': KinesisResponse().dispatch,
+    '{0}/$': KinesisResponse.dispatch,
 }

moto/rds/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': RDSResponse().dispatch,
+    '{0}/$': RDSResponse.dispatch,
 }

moto/rds2/urls.py

@@ -7,5 +7,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': RDS2Response().dispatch,
+    '{0}/$': RDS2Response.dispatch,
 }

moto/redshift/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': RedshiftResponse().dispatch,
+    '{0}/$': RedshiftResponse.dispatch,
 }

moto/server.py

@@ -74,7 +74,15 @@ def create_backend_app(service):
 
     backend = BACKENDS[service]
     for url_path, handler in backend.flask_paths.items():
-        backend_app.route(url_path, methods=HTTP_METHODS)(convert_flask_to_httpretty_response(handler))
+        if handler.__name__ == 'dispatch':
+            endpoint = '{0}.dispatch'.format(handler.__self__.__name__)
+        else:
+            endpoint = None
+
+        backend_app.route(
+            url_path,
+            endpoint=endpoint,
+            methods=HTTP_METHODS)(convert_flask_to_httpretty_response(handler))
 
     return backend_app
 

moto/ses/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': EmailResponse().dispatch,
+    '{0}/$': EmailResponse.dispatch,
 }

moto/sns/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': SNSResponse().dispatch,
+    '{0}/$': SNSResponse.dispatch,
 }

moto/sqs/urls.py

@@ -6,6 +6,6 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': QueuesResponse().dispatch,
+    '{0}/$': QueuesResponse.dispatch,
-    '{0}/(?P<account_id>\d+)/(?P<queue_name>[a-zA-Z0-9\-_]+)': QueueResponse().dispatch,
+    '{0}/(?P<account_id>\d+)/(?P<queue_name>[a-zA-Z0-9\-_]+)': QueueResponse.dispatch,
 }

moto/sts/urls.py

@@ -6,5 +6,5 @@ url_bases = [
 ]
 
 url_paths = {
-    '{0}/$': TokenResponse().dispatch,
+    '{0}/$': TokenResponse.dispatch,
 }