[modify] for python2.5 compat

examples/first.py

@@ -3,6 +3,7 @@
 # generate md doc: python -m specfor.doc examples.first
 
 # import
+from __future__ import with_statement
 from specfor import the, spec
 
 

specfor/__init__.py

@@ -1,7 +1,8 @@
 version = "0.0.6"
-from .framework import *
-from .expectation import *
-from .mockings import *
+
+from .framework import spec
+from .expectation import the
+from .mockings import mock
 
 def new_specfor():
     import sys

specfor/match.py

@@ -118,11 +118,12 @@ def __call__(self, expected):
         eindex = 0
         lefts = []
         not_founds = []
-        for match in matches:
-            lefts.extend(value[vindex:match.a])
-            not_founds.extend(exp[eindex:match.b])
-            vindex = match.a + match.size
-            eindex = match.b + match.size
+
+        for a, b, size in matches:
+            lefts.extend(value[vindex:a])
+            not_founds.extend(exp[eindex:b])
+            vindex = a + size
+            eindex = b + size
             pass
 
         assert not lefts and not not_founds, "".join(

specfor/mockings/restrictions/args.py

@@ -113,21 +113,21 @@ def __repr__(self):
 
 def just_factory(resp, kwargs):
     kwspecs = dict((k, ArgSpecJust(k, v)) for k, v in kwargs.items())
-    funcspec = inspect.getargspec(resp.result)
+    funcspec = util.getargspec(resp.result)
     argspec = ArgSpecs(kwspecs, funcspec)
     return ArgsRestiction(argspec)
 plugins.register("just", just_factory)
 
 def like_factory(resp, kwargs):
     kwspecs = dict((k, ArgSpecLike(k, v)) for k, v in kwargs.items())
-    funcspec = inspect.getargspec(resp.result)
+    funcspec = util.getargspec(resp.result)
     argspec = ArgSpecs(kwspecs, funcspec)
     return ArgsRestiction(argspec)
 plugins.register("like", like_factory)
 
 def unless_factory(resp, kwargs):
     kwspecs = dict((k, ArgSpecNot(k, v)) for k, v in kwargs.items())
-    funcspec = inspect.getargspec(resp.result)
+    funcspec = util.getargspec(resp.result)
     argspec = ArgSpecs(kwspecs, funcspec)
     return ArgsRestiction(argspec)
 plugins.register("unless", unless_factory)

specfor/mockings/util.py

@@ -1,4 +1,26 @@
 
+class funcspec(object):
+    def __init__(self, argspec):
+        self.argspec = argspec
+        pass
+    @property
+    def args(self):
+        return self.argspec[0]
+    @property
+    def varargs(self):
+        return self.argspec[1]
+    @property
+    def keywords(self):
+        return self.argspec[2]
+    @property
+    def defaults(self):
+        return self.argspec[3]
+    pass
+
+def getargspec(func):
+    import inspect
+    return funcspec(inspect.getargspec(func))
+
 def bindargs(funcspec, args, kwargs):
     """bind arg name and value by funcspec:
     

specs/for_expectation.py

@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from specfor import spec
 
 

specs/for_mock.py

@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from specfor import the, spec
 
 mock_spec = spec.of("mock")

specs/for_mock_ordered.py

@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from specfor import the, spec
 
 ordered_mock_spec = spec.of("mock with ordered call")

specs/for_mock_plugin.py

@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from specfor import spec, the
 
 spec_mock_plugin = spec.of("mock plugin")