[pypy-commit] pypy split-rpython: Moved pypy.config parts to rpython

Aquana noreply at buildbot.pypy.org
Sat Jan 12 18:42:37 CET 2013 

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r59991:a879d5890037
Date: 2013-01-12 18:42 +0100
http://bitbucket.org/pypy/pypy/changeset/a879d5890037/

Log:	Moved pypy.config parts to rpython

diff --git a/pypy/bin/pyinteractive.py b/pypy/bin/pyinteractive.py
--- a/pypy/bin/pyinteractive.py
+++ b/pypy/bin/pyinteractive.py
@@ -12,9 +12,9 @@
 import pypy
 from pypy.tool import option
 from optparse import make_option
-from pypy.interpreter import main, interactive, error, gateway
-from pypy.config.config import OptionDescription, BoolOption, StrOption
-from pypy.config.config import Config, to_optparse
+from rpython.interpreter import main, interactive, error, gateway
+from rpython.config.config import OptionDescription, BoolOption, StrOption
+from rpython.config.config import Config, to_optparse
 from pypy.config import pypyoption
 
 
diff --git a/pypy/config/makerestdoc.py b/pypy/config/makerestdoc.py
--- a/pypy/config/makerestdoc.py
+++ b/pypy/config/makerestdoc.py
@@ -2,10 +2,10 @@
 from pypy.tool.rest.rst import Rest, Paragraph, Strong, ListItem, Title, Link
 from pypy.tool.rest.rst import Directive, Em, Quote, Text
 
-from pypy.config.config import ChoiceOption, BoolOption, StrOption, IntOption
-from pypy.config.config import FloatOption, OptionDescription, Option, Config
-from pypy.config.config import ArbitraryOption, DEFAULT_OPTION_NAME
-from pypy.config.config import _getnegation
+from rpython.config.config import ChoiceOption, BoolOption, StrOption, IntOption
+from rpython.config.config import FloatOption, OptionDescription, Option, Config
+from rpython.config.config import ArbitraryOption, DEFAULT_OPTION_NAME
+from rpython.config.config import _getnegation
 
 configdocdir = py.path.local(__file__).dirpath().dirpath().join("doc", "config")
 
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -2,9 +2,9 @@
 
 import py
 
-from pypy.config.config import (OptionDescription, BoolOption, IntOption,
+from rpython.config.config import (OptionDescription, BoolOption, IntOption,
   ChoiceOption, StrOption, to_optparse, ConflictConfigError)
-from pypy.config.translationoption import IS_64_BITS
+from rpython.config.translationoption import IS_64_BITS
 
 
 modulepath = py.path.local(__file__).dirpath().dirpath().join("module")
diff --git a/pypy/config/test/test_makerestdoc.py b/pypy/config/test/test_makerestdoc.py
--- a/pypy/config/test/test_makerestdoc.py
+++ b/pypy/config/test/test_makerestdoc.py
@@ -1,4 +1,4 @@
-from pypy.config.config import *
+from rpython.config.config import *
 from pypy.config.makerestdoc import make_cmdline_overview
 
 from pypy.tool.rest.rest import process as restcheck
diff --git a/pypy/config/test/test_pypyoption.py b/pypy/config/test/test_pypyoption.py
--- a/pypy/config/test/test_pypyoption.py
+++ b/pypy/config/test/test_pypyoption.py
@@ -1,7 +1,7 @@
 import py
 from pypy.config.pypyoption import get_pypy_config, set_pypy_opt_level
-from pypy.config.config import Config, ConfigError
-from pypy.config.translationoption import set_opt_level
+from rpython.config.config import Config, ConfigError
+from rpython.config.translationoption import set_opt_level
 
 thisdir = py.path.local(__file__).dirpath()
 
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -36,7 +36,7 @@
     option = config.option
 
 def _set_platform(opt, opt_str, value, parser):
-    from pypy.config.translationoption import PLATFORMS
+    from rpython.config.translationoption import PLATFORMS
     from rpython.translator.platform import set_platform
     if value not in PLATFORMS:
         raise ValueError("%s not in %s" % (value, PLATFORMS))
diff --git a/pypy/doc/config/confrest.py b/pypy/doc/config/confrest.py
--- a/pypy/doc/config/confrest.py
+++ b/pypy/doc/config/confrest.py
@@ -1,7 +1,8 @@
 from pypy.doc.confrest import *
 from pypy.config.makerestdoc import make_cmdline_overview
-from pypy.config.config import Config
-from pypy.config import pypyoption, translationoption
+from pypy.config import pypyoption
+from rpython.config.config import Config
+from rpython.config import translationoption
 
 
 all_optiondescrs = [pypyoption.pypy_optiondescription,
diff --git a/pypy/doc/config/generate.py b/pypy/doc/config/generate.py
--- a/pypy/doc/config/generate.py
+++ b/pypy/doc/config/generate.py
@@ -1,6 +1,7 @@
 import py
-from pypy.config import pypyoption, translationoption, config, makerestdoc
+from pypy.config import pypyoption, makerestdoc
 from pypy.doc.config.confrest import all_optiondescrs
+from rpython.config import translationoption, config
 
 all_optiondescrs = [pypyoption.pypy_optiondescription,
                     translationoption.translation_optiondescription,
diff --git a/pypy/doc/config/makemodules.py b/pypy/doc/config/makemodules.py
--- a/pypy/doc/config/makemodules.py
+++ b/pypy/doc/config/makemodules.py
@@ -1,5 +1,6 @@
 import py
-from pypy.config import pypyoption, translationoption, config
+from pypy.config import pypyoption
+from rpython.config import translationoption, config
 
 thisdir = py.path.local(__file__).dirpath()
 
diff --git a/pypy/doc/configuration.rst b/pypy/doc/configuration.rst
--- a/pypy/doc/configuration.rst
+++ b/pypy/doc/configuration.rst
@@ -133,7 +133,7 @@
 ``OptionDescription`` instance. The attributes of the ``Config`` objects are the
 names of the children of the ``OptionDescription``. Example::
 
-    >>> from pypy.config.config import OptionDescription, Config, BoolOption
+    >>> from rpython.config.config import OptionDescription, Config, BoolOption
     >>> descr = OptionDescription("options", "", [
     ...     BoolOption("bool", "", default=False)])
     >>>
diff --git a/pypy/tool/option.py b/pypy/tool/option.py
--- a/pypy/tool/option.py
+++ b/pypy/tool/option.py
@@ -2,7 +2,7 @@
 
 import os
 from pypy.config.pypyoption import get_pypy_config
-from pypy.config.config import Config, OptionDescription, to_optparse
+from rpython.config.config import Config, OptionDescription, to_optparse
 import optparse
 
 extra_useage = """For detailed descriptions of all the options see
diff --git a/pypy/tool/pypyjit.py b/pypy/tool/pypyjit.py
--- a/pypy/tool/pypyjit.py
+++ b/pypy/tool/pypyjit.py
@@ -8,7 +8,7 @@
 import py, os
 
 from pypy.objspace.std import Space
-from pypy.config.translationoption import set_opt_level
+from rpython.config.translationoption import set_opt_level
 from pypy.config.pypyoption import get_pypy_config, set_pypy_opt_level
 from pypy.objspace.std import multimethod
 from rpython.rtyper.annlowlevel import llhelper, llstr, oostr, hlstr
diff --git a/pypy/tool/pytest/objspace.py b/pypy/tool/pytest/objspace.py
--- a/pypy/tool/pytest/objspace.py
+++ b/pypy/tool/pytest/objspace.py
@@ -1,6 +1,6 @@
 import py
 import sys
-from pypy.config.config import ConflictConfigError
+from rpython.config.config import ConflictConfigError
 from pypy.tool.option import make_config, make_objspace
 from pypy.tool.pytest import appsupport
 from pypy.conftest import option
diff --git a/pypy/config/__init__.py b/rpython/config/__init__.py
copy from pypy/config/__init__.py
copy to rpython/config/__init__.py
diff --git a/pypy/config/config.py b/rpython/config/config.py
rename from pypy/config/config.py
rename to rpython/config/config.py
diff --git a/pypy/config/parse.py b/rpython/config/parse.py
rename from pypy/config/parse.py
rename to rpython/config/parse.py
diff --git a/pypy/config/support.py b/rpython/config/support.py
rename from pypy/config/support.py
rename to rpython/config/support.py
diff --git a/pypy/config/test/test_config.py b/rpython/config/test/test_config.py
rename from pypy/config/test/test_config.py
rename to rpython/config/test/test_config.py
--- a/pypy/config/test/test_config.py
+++ b/rpython/config/test/test_config.py
@@ -1,4 +1,4 @@
-from pypy.config.config import *
+from rpython.config.config import *
 import py, sys
 
 def make_description():
diff --git a/pypy/config/test/test_parse.py b/rpython/config/test/test_parse.py
rename from pypy/config/test/test_parse.py
rename to rpython/config/test/test_parse.py
--- a/pypy/config/test/test_parse.py
+++ b/rpython/config/test/test_parse.py
@@ -1,4 +1,4 @@
-from pypy.config.parse import parse_info
+from rpython.config.parse import parse_info
 
 
 def test_parse_new_format():
diff --git a/pypy/config/test/test_support.py b/rpython/config/test/test_support.py
rename from pypy/config/test/test_support.py
rename to rpython/config/test/test_support.py
--- a/pypy/config/test/test_support.py
+++ b/rpython/config/test/test_support.py
@@ -1,6 +1,6 @@
 
 from cStringIO import StringIO
-from pypy.config import support
+from rpython.config import support
 import os, sys, py
 
 cpuinfo = """
diff --git a/pypy/config/test/test_translationoption.py b/rpython/config/test/test_translationoption.py
rename from pypy/config/test/test_translationoption.py
rename to rpython/config/test/test_translationoption.py
--- a/pypy/config/test/test_translationoption.py
+++ b/rpython/config/test/test_translationoption.py
@@ -1,7 +1,7 @@
 import py
-from pypy.config.translationoption import get_combined_translation_config
-from pypy.config.translationoption import set_opt_level
-from pypy.config.config import ConflictConfigError
+from rpython.config.translationoption import get_combined_translation_config
+from rpython.config.translationoption import set_opt_level
+from rpython.config.config import ConflictConfigError
 
 
 def test_no_gcrootfinder_with_boehm():
diff --git a/pypy/config/translationoption.py b/rpython/config/translationoption.py
rename from pypy/config/translationoption.py
rename to rpython/config/translationoption.py
--- a/pypy/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -1,8 +1,8 @@
 import py, os, sys
-from pypy.config.config import OptionDescription, BoolOption, IntOption, ArbitraryOption, FloatOption
-from pypy.config.config import ChoiceOption, StrOption, to_optparse, Config
-from pypy.config.config import ConfigError
-from pypy.config.support import detect_number_of_processors
+from rpython.config.config import OptionDescription, BoolOption, IntOption, ArbitraryOption, FloatOption
+from rpython.config.config import ChoiceOption, StrOption, to_optparse, Config
+from rpython.config.config import ConfigError
+from rpython.config.support import detect_number_of_processors
 
 DEFL_INLINE_THRESHOLD = 32.4    # just enough to inline add__Int_Int()
 # and just small enough to prevend inlining of some rlist functions.
diff --git a/rpython/jit/backend/arm/test/test_zrpy_gc.py b/rpython/jit/backend/arm/test/test_zrpy_gc.py
--- a/rpython/jit/backend/arm/test/test_zrpy_gc.py
+++ b/rpython/jit/backend/arm/test/test_zrpy_gc.py
@@ -13,7 +13,7 @@
 from rpython.rlib.jit import elidable, unroll_safe
 from rpython.jit.backend.llsupport.gc import GcLLDescr_framework
 from rpython.tool.udir import udir
-from pypy.config.translationoption import DEFL_GC
+from rpython.config.translationoption import DEFL_GC
 from rpython.jit.backend.arm.test.support import skip_unless_run_slow_tests
 skip_unless_run_slow_tests()
 
diff --git a/rpython/jit/backend/arm/test/test_ztranslation.py b/rpython/jit/backend/arm/test/test_ztranslation.py
--- a/rpython/jit/backend/arm/test/test_ztranslation.py
+++ b/rpython/jit/backend/arm/test/test_ztranslation.py
@@ -9,7 +9,7 @@
 from rpython.jit.backend.test.support import CCompiledMixin
 from rpython.jit.codewriter.policy import StopAtXPolicy
 from rpython.translator.translator import TranslationContext
-from pypy.config.translationoption import DEFL_GC
+from rpython.config.translationoption import DEFL_GC
 from rpython.rlib import rgc
 from rpython.jit.backend.arm.test.support import skip_unless_run_slow_tests
 skip_unless_run_slow_tests()
diff --git a/rpython/jit/backend/x86/test/test_zrpy_gc.py b/rpython/jit/backend/x86/test/test_zrpy_gc.py
--- a/rpython/jit/backend/x86/test/test_zrpy_gc.py
+++ b/rpython/jit/backend/x86/test/test_zrpy_gc.py
@@ -13,7 +13,7 @@
 from rpython.rlib.jit import elidable, unroll_safe
 from rpython.jit.backend.llsupport.gc import GcLLDescr_framework
 from rpython.tool.udir import udir
-from pypy.config.translationoption import DEFL_GC
+from rpython.config.translationoption import DEFL_GC
 
 class X(object):
     def __init__(self, x=0):
diff --git a/rpython/jit/backend/x86/test/test_ztranslation.py b/rpython/jit/backend/x86/test/test_ztranslation.py
--- a/rpython/jit/backend/x86/test/test_ztranslation.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation.py
@@ -10,7 +10,7 @@
 from rpython.jit.codewriter.policy import StopAtXPolicy
 from rpython.translator.translator import TranslationContext
 from rpython.jit.backend.x86.arch import IS_X86_32, IS_X86_64
-from pypy.config.translationoption import DEFL_GC
+from rpython.config.translationoption import DEFL_GC
 from rpython.rlib import rgc
 
 class TestTranslationX86(CCompiledMixin):
diff --git a/rpython/jit/metainterp/warmspot.py b/rpython/jit/metainterp/warmspot.py
--- a/rpython/jit/metainterp/warmspot.py
+++ b/rpython/jit/metainterp/warmspot.py
@@ -70,7 +70,7 @@
                     inline=False, loop_longevity=0, retrace_limit=5,
                     function_threshold=4,
                     enable_opts=ALL_OPTS_NAMES, max_retrace_guards=15, **kwds):
-    from pypy.config.config import ConfigError
+    from rpython.config.config import ConfigError
     translator = interp.typer.annotator.translator
     try:
         translator.config.translation.gc = "boehm"
diff --git a/rpython/translator/cli/gencli.py b/rpython/translator/cli/gencli.py
--- a/rpython/translator/cli/gencli.py
+++ b/rpython/translator/cli/gencli.py
@@ -3,7 +3,7 @@
 
 import py
 import subprocess
-from pypy.config.config import Config
+from rpython.config.config import Config
 from rpython.translator.oosupport.genoo import GenOO
 from rpython.translator.cli import conftest
 from rpython.translator.cli.ilgenerator import IlasmGenerator
diff --git a/rpython/translator/goal/translate.py b/rpython/translator/goal/translate.py
--- a/rpython/translator/goal/translate.py
+++ b/rpython/translator/goal/translate.py
@@ -16,9 +16,9 @@
 except Exception:
     pass
 
-from pypy.config.config import (to_optparse, OptionDescription, BoolOption,
+from rpython.config.config import (to_optparse, OptionDescription, BoolOption,
     ArbitraryOption, StrOption, IntOption, Config, ChoiceOption, OptHelpFormatter)
-from pypy.config.translationoption import (get_combined_translation_config,
+from rpython.config.translationoption import (get_combined_translation_config,
     set_opt_level, final_check_config, OPT_LEVELS, DEFAULT_OPT_LEVEL, set_platform)
 
 
diff --git a/rpython/translator/translator.py b/rpython/translator/translator.py
--- a/rpython/translator/translator.py
+++ b/rpython/translator/translator.py
@@ -12,8 +12,8 @@
 from rpython.tool.ansi_print import ansi_log
 from rpython.tool.sourcetools import nice_repr_for_func
 from pypy.config.pypyoption import pypy_optiondescription
-from pypy.config.translationoption import get_combined_translation_config
-from pypy.config.translationoption import get_platform
+from rpython.config.translationoption import get_combined_translation_config
+from rpython.config.translationoption import get_platform
 import py
 log = py.log.Producer("flowgraph")
 py.log.setconsumer("flowgraph", ansi_log)

More information about the pypy-commit mailing list