[pypy-commit] pypy matrixmath-dot: bad merge

[mattip]

Author: mattip
Branch: matrixmath-dot
Changeset: r50187:09f8917ecaf3
Date: 2011-12-04 22:09 +0200
http://bitbucket.org/pypy/pypy/changeset/09f8917ecaf3/

Log:	bad merge

diff --git a/pypy/module/micronumpy/test/test_compile.py b/pypy/module/micronumpy/test/test_compile.py
--- a/pypy/module/micronumpy/test/test_compile.py
+++ b/pypy/module/micronumpy/test/test_compile.py
@@ -1,9 +1,10 @@
+import py
 
-import py
 from pypy.module.micronumpy.compile import (numpy_compile, Assignment,
     ArrayConstant, FloatConstant, Operator, Variable, RangeConstant, Execute,
     FunctionCall, FakeSpace)
 
+
 class TestCompiler(object):
     def compile(self, code):
         return numpy_compile(code)