[pypy-commit] pypy default: stylistic cleanups

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r51189:409a8b279f54
Date: 2012-01-09 16:55 -0600
http://bitbucket.org/pypy/pypy/changeset/409a8b279f54/

Log:	stylistic cleanups

diff --git a/pypy/module/micronumpy/interp_boxes.py b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -104,7 +104,7 @@
     _attrs_ = ()
 
 class W_IntegerBox(W_NumberBox):
-    descr__new__, get_dtype = new_dtype_getter("long")
+    pass
 
 class W_SignedIntegerBox(W_IntegerBox):
     pass
@@ -200,7 +200,6 @@
 )
 
 W_IntegerBox.typedef = TypeDef("integer", W_NumberBox.typedef,
-    __new__ = interp2app(W_IntegerBox.descr__new__.im_func),
     __module__ = "numpypy",
 )
 
@@ -248,6 +247,7 @@
     long_name = "int64"
 W_LongBox.typedef = TypeDef(long_name, (W_SignedIntegerBox.typedef, int_typedef,),
     __module__ = "numpypy",
+   __new__ = interp2app(W_LongBox.descr__new__.im_func),
 )
 
 W_ULongBox.typedef = TypeDef("u" + long_name, W_UnsignedIntegerBox.typedef,
diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -564,7 +564,7 @@
         return space.div(self.descr_sum(space), space.wrap(self.size))
 
     def descr_var(self, space):
-        ''' var = mean( (values - mean(values))**2 ) '''
+        # var = mean((values - mean(values)) ** 2)
         w_res = self.descr_sub(space, self.descr_mean(space))
         assert isinstance(w_res, BaseArray) 
         w_res = w_res.descr_pow(space, space.wrap(2))
@@ -572,8 +572,8 @@
         return w_res.descr_mean(space)
 
     def descr_std(self, space):
-        ''' std(v) = sqrt(var(v)) '''
-        return interp_ufuncs.get(space).sqrt.call(space, [self.descr_var(space)] )
+        # std(v) = sqrt(var(v))
+        return interp_ufuncs.get(space).sqrt.call(space, [self.descr_var(space)])
 
     def descr_nonzero(self, space):
         if self.size > 1: