Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r72302:13859c071d0f
Date: 2014-07-01 05:11 +0100
http://bitbucket.org/pypy/pypy/changeset/13859c071d0f/
Log: don't import stuuf from conftest for no bloody reason
diff --git a/rpython/conftest.py b/rpython/conftest.py
--- a/rpython/conftest.py
+++ b/rpython/conftest.py
@@ -1,10 +1,8 @@
-from os.path import *
import py, pytest
from rpython.tool import leakfinder
pytest_plugins = 'rpython.tool.pytest.expecttest'
-cdir = realpath(join(dirname(__file__), 'translator', 'c'))
option = None
def braindead_deindent(self):
diff --git a/rpython/rlib/_rffi_stacklet.py b/rpython/rlib/_rffi_stacklet.py
--- a/rpython/rlib/_rffi_stacklet.py
+++ b/rpython/rlib/_rffi_stacklet.py
@@ -3,7 +3,7 @@
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.rtyper.tool import rffi_platform
from rpython.rlib.rarithmetic import is_emulated_long
-from rpython.conftest import cdir
+from rpython.translator import cdir
cdir = py.path.local(cdir)
diff --git a/rpython/rlib/clibffi.py b/rpython/rlib/clibffi.py
--- a/rpython/rlib/clibffi.py
+++ b/rpython/rlib/clibffi.py
@@ -15,7 +15,7 @@
from rpython.rlib.objectmodel import specialize
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import platform
-from rpython.conftest import cdir
+from rpython.translator import cdir
from platform import machine
import py
import os
diff --git a/rpython/rlib/rdtoa.py b/rpython/rlib/rdtoa.py
--- a/rpython/rlib/rdtoa.py
+++ b/rpython/rlib/rdtoa.py
@@ -1,7 +1,7 @@
from __future__ import with_statement
from rpython.rlib import rfloat
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from rpython.conftest import cdir
+from rpython.translator import cdir
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rlib import jit
from rpython.rlib.rstring import StringBuilder
diff --git a/rpython/rlib/rgil.py b/rpython/rlib/rgil.py
--- a/rpython/rlib/rgil.py
+++ b/rpython/rlib/rgil.py
@@ -1,5 +1,5 @@
import py
-from rpython.conftest import cdir
+from rpython.translator import cdir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
diff --git a/rpython/rlib/rsignal.py b/rpython/rlib/rsignal.py
--- a/rpython/rlib/rsignal.py
+++ b/rpython/rlib/rsignal.py
@@ -1,7 +1,7 @@
import signal as cpy_signal
import sys
import py
-from rpython.conftest import cdir
+from rpython.translator import cdir
from rpython.rtyper.tool import rffi_platform
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/rpython/rlib/rstack.py b/rpython/rlib/rstack.py
--- a/rpython/rlib/rstack.py
+++ b/rpython/rlib/rstack.py
@@ -10,7 +10,7 @@
from rpython.rlib import rgc
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rtyper.lltypesystem.lloperation import llop
-from rpython.conftest import cdir
+from rpython.translator import cdir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
# ____________________________________________________________
diff --git a/rpython/rlib/rthread.py b/rpython/rlib/rthread.py
--- a/rpython/rlib/rthread.py
+++ b/rpython/rlib/rthread.py
@@ -1,6 +1,6 @@
from rpython.rtyper.lltypesystem import rffi, lltype, llmemory
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from rpython.conftest import cdir
+from rpython.translator import cdir
import py
from rpython.rlib import jit, rgc
from rpython.rlib.debug import ll_assert
@@ -59,7 +59,7 @@
c_thread_acquirelock = llexternal('RPyThreadAcquireLock', [TLOCKP, rffi.INT],
rffi.INT,
releasegil=True) # release the GIL
-c_thread_acquirelock_timed = llexternal('RPyThreadAcquireLockTimed',
+c_thread_acquirelock_timed = llexternal('RPyThreadAcquireLockTimed',
[TLOCKP, rffi.LONGLONG, rffi.INT],
rffi.INT,
releasegil=True) # release the GIL
diff --git a/rpython/rtyper/lltypesystem/module/ll_math.py
b/rpython/rtyper/lltypesystem/module/ll_math.py
--- a/rpython/rtyper/lltypesystem/module/ll_math.py
+++ b/rpython/rtyper/lltypesystem/module/ll_math.py
@@ -3,7 +3,7 @@
import py
import sys
-from rpython.conftest import cdir
+from rpython.translator import cdir
from rpython.rlib import jit, rposix
from rpython.rlib.rfloat import INFINITY, NAN, isfinite, isinf, isnan
from rpython.rtyper.lltypesystem import lltype, rffi
diff --git a/rpython/translator/__init__.py b/rpython/translator/__init__.py
--- a/rpython/translator/__init__.py
+++ b/rpython/translator/__init__.py
@@ -0,0 +1,3 @@
+from os.path import realpath, join, dirname
+cdir = realpath(join(dirname(__file__), 'c'))
+del realpath, join, dirname
diff --git a/rpython/translator/c/test/test_standalone.py
b/rpython/translator/c/test/test_standalone.py
--- a/rpython/translator/c/test/test_standalone.py
+++ b/rpython/translator/c/test/test_standalone.py
@@ -13,7 +13,7 @@
from rpython.translator.c.genc import CStandaloneBuilder,
ExternalCompilationInfo
from rpython.annotator.listdef import s_list_of_strings
from rpython.tool.udir import udir
-from rpython.conftest import cdir
+from rpython.translator import cdir
from rpython.conftest import option
def setup_module(module):
@@ -382,7 +382,7 @@
if str(path).find(':')>=0:
# bad choice of udir, there is a ':' in it which messes up the test
pass
- else:
+ else:
out, err = cbuilder.cmdexec("", err=True, env={'PYPYLOG':
str(path)})
size = os.stat(str(path)).st_size
assert out.strip() == 'got:a.' + str(size) + '.'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
