Merge branch 'master' into release/1.19

autopush/web/health.py

@@ -14,7 +14,7 @@ class HealthHandler(BaseWebHandler):
     """HTTP Health Handler"""
 
     @cyclone.web.asynchronous
-    def get(self):
+    def get(self, *args, **kwargs):
         """HTTP Get
 
         Returns basic information about the version and how many clients are
@@ -83,7 +83,7 @@ def authenticate_peer_cert(self):
         """skip authentication checks"""
         pass
 
-    def get(self):
+    def get(self, *args, **kwargs):
         """HTTP Get
 
         Returns that this node is alive, and the version.

autopush/web/log_check.py

@@ -21,7 +21,7 @@ def authenticate_peer_cert(self):
         pass
 
     @threaded_validate(LogCheckSchema)
-    def get(self, err_type=None):
+    def get(self, err_type=None, *args, **kwargs):
         """HTTP GET
 
         Generate a dummy error message for logging

autopush/web/registration.py

@@ -127,7 +127,7 @@ class RegistrationHandler(BaseWebHandler):
     #                    Cyclone HTTP Methods
     #############################################################
     @threaded_validate(RegistrationSchema)
-    def post(self, *args):
+    def post(self, *args, **kwargs):
         """HTTP POST
 
         Endpoint generation and optionally router type/data registration.
@@ -173,7 +173,7 @@ def post(self, *args):
             d.addErrback(self._response_err)
 
     @threaded_validate(RegistrationSchema)
-    def put(self, *args):
+    def put(self, *args, **kwargs):
         """HTTP PUT
 
         Update router type/data for a UAID.
@@ -214,7 +214,7 @@ def _register_channel(self, router_data=None):
         return endpoint, router_data
 
     @threaded_validate(RegistrationSchema)
-    def delete(self, *args):
+    def delete(self, *args, **kwargs):
         """HTTP DELETE
 
         Delete all pending records for the given channel or UAID

autopush/web/simplepush.py

@@ -15,7 +15,7 @@ class SimplePushHandler(BaseWebHandler):
     cors_methods = "PUT"
 
     @threaded_validate(SimplePushRequestSchema)
-    def put(self, api_ver="v1", token=None):
+    def put(self, *args, **kwargs):
         sub = self.valid_input["subscription"]
         user_data = sub["user_data"]
         router = self.ap_settings.routers[user_data["router_type"]]

autopush/web/webpush.py

@@ -18,7 +18,7 @@ class WebPushHandler(BaseWebHandler):
     cors_response_headers = ("location", "www-authenticate")
 
     @threaded_validate(WebPushRequestSchema)
-    def post(self, api_ver="v1", token=None):
+    def post(self, *args, **kwargs):
         # Store Vapid info if present
         jwt = self.valid_input.get("jwt")
         if jwt:

base-requirements.txt

@@ -1,62 +1,43 @@
 ConfigArgParse==0.10.0
-Flask==0.11.1
-Jinja2==2.8
-MarkupSafe==0.23
-Pympler==0.4.3
 Twisted==16.4.0
-Werkzeug==0.11.10
 apns==2.0.1
 attrs==16.1.0
 autobahn[twisted]==0.16.0
 boto==2.42.0
 boto3==1.4.0
 botocore==1.4.50
 cffi==1.7.0
-characteristic==14.3.0
 click==6.6
 contextlib2==0.5.4
 cryptography==1.5
 cyclone==1.1
 datadog==0.13.0
 decorator==4.0.10
-docutils==0.12
 ecdsa==0.13
 enum34==1.1.6
-funcsigs==1.0.2
 future==0.15.2
 futures==3.0.5
 gcm-client==0.1.4
-greenlet==0.4.10
-httpretty==0.8.14
 hyper==0.6.2
 idna==2.1
 ipaddress==1.0.16
-itsdangerous==0.24
 jmespath==0.9.0
 marshmallow==2.10.2
-mccabe==0.5.2
-pbr==1.10.0
-pluggy==0.3.1
 pyOpenSSL==16.1.0
 pyasn1==0.1.9
 pyasn1-modules==0.0.8
 pycparser==2.14
 pycrypto==2.6.1
 pyfcm==1.0.4
-pyflakes==1.2.3
 python-dateutil==2.5.3
 python-jose==1.3.2
 raven==5.25.0
 requests==2.11.0
 service-identity==16.0.0
 simplejson==3.8.2
 six==1.10.0
-translationstring==1.3
 typing==3.5.2.2
 -e git+https://github.com/habnabit/txstatsd.git@157ef85fbdeafe23865c7c4e176237ffcb3c3f1f#egg=txStatsD-master
 txaio==2.5.1
 ua_parser==0.7.1
-virtualenv==15.0.3
-xmltodict==0.10.2
-zope.deprecation==4.1.2
 zope.interface==4.3.1

test-requirements.txt

@@ -2,8 +2,13 @@
 nose
 coverage
 mock>=1.0.1
+funcsigs==1.0.2
+pbr==1.10.0
 -e git+https://github.com/habnabit/txstatsd.git@master#egg=txStatsD
 -e git+https://github.com/bbangert/moto.git@3bdb75a961148ea5aa526f0e88d9e7835a30df3a#egg=moto
 flake8==3.0.4
+mccabe==0.5.2
+pyflakes==1.2.3
 psutil
 websocket-client
+Pympler==0.4.3