Merge pull request #31 from mocketize/mockhttp-entry-subclassing

Subclassing required to re-implement register methods.

Author: mindflayer

mocket/mockhttp.py

@@ -118,10 +118,10 @@ def _parse_requestline(line):
         else:
             raise ValueError('Not a Request-Line')
 
-    @staticmethod
-    def register(method, uri, *responses):
-        Mocket.register(Entry(uri, method, responses))
+    @classmethod
+    def register(cls, method, uri, *responses):
+        Mocket.register(cls(uri, method, responses))
 
-    @staticmethod
-    def single_register(method, uri, body='', status=200, headers=None):
-        Entry.register(method, uri, Response(body=body, status=status, headers=headers))
+    @classmethod
+    def single_register(cls, method, uri, body='', status=200, headers=None):
+        cls.register(method, uri, Response(body=body, status=status, headers=headers))

mocket/mockredis.py

@@ -60,15 +60,15 @@ def __init__(self, addr, command, responses):
     def can_handle(self, data):
         return data.splitlines() == self.command
 
-    @staticmethod
-    def register(addr, command, *responses):
-        responses = [Entry.response_cls(r) for r in responses]
-        Mocket.register(Entry(addr, command, responses))
-
-    @staticmethod
-    def register_response(command, response, addr=None):
-        Entry.register(addr, command, response)
-
-    @staticmethod
-    def register_responses(command, responses, addr=None):
-        Entry.register(addr, command, *responses)
+    @classmethod
+    def register(cls, addr, command, *responses):
+        responses = [cls.response_cls(r) for r in responses]
+        Mocket.register(cls(addr, command, responses))
+
+    @classmethod
+    def register_response(cls, command, response, addr=None):
+        cls.register(addr, command, response)
+
+    @classmethod
+    def register_responses(cls, command, responses, addr=None):
+        cls.register(addr, command, *responses)

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='mocket',
-    version='1.3.3',
+    version='1.3.4',
     author='Andrea de Marco, Giorgio Salluzzo',
     author_email='24erre@gmail.com, giorgio.salluzzo@gmail.com',
     url='https://github.com/mocketize/python-mocket',