[pypy-commit] pypy default: merged upstream

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r50294:26bac7f772ca
Date: 2011-12-08 05:42 -0500
http://bitbucket.org/pypy/pypy/changeset/26bac7f772ca/

Log:	merged upstream

diff --git a/pypy/module/clr/boxing_rules.py b/pypy/module/clr/boxing_rules.py
--- a/pypy/module/clr/boxing_rules.py
+++ b/pypy/module/clr/boxing_rules.py
@@ -43,11 +43,11 @@
     def tocli(self):
         return box(self._value)
 
-from pypy.objspace.fake.objspace import W_Object as W_Object_Fake
-from pypy.rlib.nonconst import NonConstant
+##from pypy.objspace.fake.objspace import W_Object as W_Object_Fake
+##from pypy.rlib.nonconst import NonConstant
 
-class __extend__(W_Object_Fake):
-    __metaclass__ = extendabletype
+##class __extend__(W_Object_Fake):
+##    __metaclass__ = extendabletype
 
-    def tocli(self):
-        return NonConstant(None)
+##    def tocli(self):
+##        return NonConstant(None)