[pypy-commit] pypy kill-someobject: fix fix fix

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: kill-someobject
Changeset: r58024:327fa32d5cc9
Date: 2012-10-12 10:31 +0200
http://bitbucket.org/pypy/pypy/changeset/327fa32d5cc9/

Log:	fix fix fix

diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
--- a/pypy/interpreter/gateway.py
+++ b/pypy/interpreter/gateway.py
@@ -856,7 +856,7 @@
             if name.startswith('w_'):
                 assert defaultval is None, (
                     "%s: default value for '%s' can only be None; "
-                    "use unwrap_spec(...=(W_Root, 'default_expr'))" % (
+                    "use unwrap_spec(...=WrappedDefault(default))" % (
                     self._code.identifier, name))
                 defs_w.append(None)
             else:
diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py
--- a/pypy/module/_sre/interp_sre.py
+++ b/pypy/module/_sre/interp_sre.py
@@ -285,7 +285,8 @@
         return w_item, n
 
 
- at unwrap_spec(flags=int, groups=int)
+ at unwrap_spec(flags=int, groups=int, w_groupindex=WrappedDefault(None),
+             w_indexgroup=WrappedDefault(None))
 def SRE_Pattern__new__(space, w_subtype, w_pattern, flags, w_code,
               groups=0, w_groupindex=None, w_indexgroup=None):
     n = space.len_w(w_code)
@@ -358,11 +359,13 @@
                 results[i] = slice_w(space, ctx, start, end, space.w_None)
             return space.newtuple(results)
 
+    @unwrap_spec(w_default=WrappedDefault(None))
     def groups_w(self, w_default=None):
         fmarks = self.flatten_marks()
         num_groups = self.srepat.num_groups
         return allgroups_w(self.space, self.ctx, fmarks, num_groups, w_default)
 
+    @unwrap_spec(w_default=WrappedDefault(None))
     def groupdict_w(self, w_default=None):
         space = self.space
         w_dict = space.newdict()
diff --git a/pypy/module/_warnings/interp_warnings.py b/pypy/module/_warnings/interp_warnings.py
--- a/pypy/module/_warnings/interp_warnings.py
+++ b/pypy/module/_warnings/interp_warnings.py
@@ -57,7 +57,7 @@
     # Get category
     if space.isinstance_w(w_message, space.w_Warning):
         w_category = space.type(w_message)
-    elif space.is_w(w_category, space.w_None):
+    elif space.is_none(w_category):
         w_category = space.w_UserWarning
 
     # Validate category
diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -1,7 +1,7 @@
 from pypy.rpython.tool import rffi_platform as platform
 from pypy.rpython.lltypesystem import rffi, lltype
 from pypy.interpreter.error import OperationError, wrap_oserror
-from pypy.interpreter.gateway import unwrap_spec
+from pypy.interpreter.gateway import unwrap_spec, WrappedDefault
 from pypy.rlib import rposix
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 import sys
@@ -89,8 +89,8 @@
     l.c_l_type = rffi.cast(rffi.SHORT, l_type)
     return l
 
- at unwrap_spec(op=int)
-def fcntl(space, w_fd, op, w_arg=0):
+ at unwrap_spec(op=int, w_arg=WrappedDefault(0))
+def fcntl(space, w_fd, op, w_arg):
     """fcntl(fd, op, [arg])
 
     Perform the requested operation on file descriptor fd.  The operation
@@ -206,8 +206,8 @@
     finally:
         lltype.free(l, flavor='raw')
 
- at unwrap_spec(op=int, mutate_flag=int)
-def ioctl(space, w_fd, op, w_arg=0, mutate_flag=-1):
+ at unwrap_spec(op=int, mutate_flag=int, w_arg=WrappedDefault(0))
+def ioctl(space, w_fd, op, w_arg, mutate_flag=-1):
     """ioctl(fd, opt[, arg[, mutate_flag]])
 
     Perform the requested operation on file descriptor fd.  The operation is
diff --git a/pypy/module/itertools/interp_itertools.py b/pypy/module/itertools/interp_itertools.py
--- a/pypy/module/itertools/interp_itertools.py
+++ b/pypy/module/itertools/interp_itertools.py
@@ -1,7 +1,7 @@
 from pypy.interpreter.baseobjspace import Wrappable
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.typedef import TypeDef, make_weakref_descr
-from pypy.interpreter.gateway import interp2app, unwrap_spec
+from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
 
 class W_Count(Wrappable):
 
@@ -49,7 +49,8 @@
         raise OperationError(space.w_TypeError,
                              space.wrap("expected a number"))
 
-def W_Count___new__(space, w_subtype, w_start=0, w_step=1):
+ at unwrap_spec(w_start=WrappedDefault(0), w_step=WrappedDefault(1))
+def W_Count___new__(space, w_subtype, w_start, w_step):
     check_number(space, w_start)
     check_number(space, w_step)
     r = space.allocate_instance(W_Count, w_subtype)