Author: Manuel Jacob
Branch: py3k
Changeset: r64108:a20ff6733d15
Date: 2013-05-14 23:43 +0200
http://bitbucket.org/pypy/pypy/changeset/a20ff6733d15/
Log: hg merge default
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -32,12 +32,13 @@
"rctime" , "select", "zipimport", "_lsprof",
"crypt", "signal", "_rawffi", "termios", "zlib", "bz2",
"struct", "_hashlib", "_md5", "_minimal_curses",
- "thread", "itertools", "pyexpat", "_ssl", "cpyext", "array",
+ "thread", "itertools", "pyexpat", "_ssl", "array",
"binascii", "_multiprocessing", '_warnings',
"_collections", "_multibytecodec", "_ffi",
"_continuation", "_csv", "_cffi_backend",
"_posixsubprocess", # "cppyy", "micronumpy",
]
+# disabled until problems are fixed
))
translation_modules = default_modules.copy()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
