[pypy-commit] pypy reflex-support: reduce differences with default

[wlav]

Author: Wim Lavrijsen <WLavrijsen at lbl.gov>
Branch: reflex-support
Changeset: r55713:afa3ace4d11f
Date: 2012-06-18 17:18 -0700
http://bitbucket.org/pypy/pypy/changeset/afa3ace4d11f/

Log:	reduce differences with default

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -2,7 +2,9 @@
 *.py[co]
 *~
 .*.swp
-*.so
+.idea
+.project
+.pydevproject
 
 syntax: regexp
 ^testresult$
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -34,7 +34,7 @@
      "thread", "itertools", "pyexpat", "_ssl", "cpyext", "array",
      "_bisect", "binascii", "_multiprocessing", '_warnings',
      "_collections", "_multibytecodec", "micronumpy", "_ffi",
-     "_continuation", "cppyy"]
+     "_continuation"]
 ))
 
 translation_modules = default_modules.copy()
diff --git a/pypy/jit/tl/pypyjit.py b/pypy/jit/tl/pypyjit.py
--- a/pypy/jit/tl/pypyjit.py
+++ b/pypy/jit/tl/pypyjit.py
@@ -43,7 +43,7 @@
 config.objspace.usemodules._lsprof = False
 #
 config.objspace.usemodules._ffi = True
-config.objspace.usemodules.cppyy = True
+#config.objspace.usemodules.cppyy = True
 config.objspace.usemodules.micronumpy = False
 #
 set_pypy_opt_level(config, level='jit')