[pypy-svn] r57521 - in pypy/dist/pypy: config lib
arigo at codespeak.net
arigo at codespeak.net
Wed Aug 20 17:36:34 CEST 2008
Author: arigo
Date: Wed Aug 20 17:36:32 2008
New Revision: 57521
Modified:
pypy/dist/pypy/config/pypyoption.py
pypy/dist/pypy/lib/_sre.py
pypy/dist/pypy/lib/cStringIO.py
pypy/dist/pypy/lib/itertools.py
pypy/dist/pypy/lib/marshal.py
pypy/dist/pypy/lib/md5.py
pypy/dist/pypy/lib/readline.py
pypy/dist/pypy/lib/sha.py
Log:
* itertools works.
* a few simple modules seem to compile fine for the CLI.
* add a comment in some modules from pypy/lib/ about being shadowed by a
built-in module.
Modified: pypy/dist/pypy/config/pypyoption.py
==============================================================================
--- pypy/dist/pypy/config/pypyoption.py (original)
+++ pypy/dist/pypy/config/pypyoption.py Wed Aug 20 17:36:32 2008
@@ -28,12 +28,12 @@
"rctime" , "select", "zipimport", "_lsprof",
"crypt", "signal", "dyngram", "_rawffi", "termios", "zlib",
"struct", "md5", "sha", "bz2", "_minimal_curses", "cStringIO",
- "thread"]
+ "thread", "itertools"]
))
working_oo_modules = default_modules.copy()
working_oo_modules.update(dict.fromkeys(
- [] # XXX at least, this probably works: "md5", "sha", "cStringIO"
+ ["md5", "sha", "cStringIO", "itertools"]
))
if sys.platform == "win32":
Modified: pypy/dist/pypy/lib/_sre.py
==============================================================================
--- pypy/dist/pypy/lib/_sre.py (original)
+++ pypy/dist/pypy/lib/_sre.py Wed Aug 20 17:36:32 2008
@@ -1,4 +1,8 @@
# NOT_RPYTHON
+
+# Note that PyPy contains also a built-in module '_sre' which will hide
+# this one if compiled in.
+
"""
A pure Python reimplementation of the _sre module from CPython 2.4
Copyright 2005 Nik Haldimann, licensed under the MIT license
Modified: pypy/dist/pypy/lib/cStringIO.py
==============================================================================
--- pypy/dist/pypy/lib/cStringIO.py (original)
+++ pypy/dist/pypy/lib/cStringIO.py Wed Aug 20 17:36:32 2008
@@ -2,6 +2,9 @@
# StringIO-based cStringIO implementation.
#
+# Note that PyPy contains also a built-in module 'cStringIO' which will hide
+# this one if compiled in.
+
from StringIO import *
from StringIO import __doc__
Modified: pypy/dist/pypy/lib/itertools.py
==============================================================================
--- pypy/dist/pypy/lib/itertools.py (original)
+++ pypy/dist/pypy/lib/itertools.py Wed Aug 20 17:36:32 2008
@@ -1,3 +1,6 @@
+# Note that PyPy contains also a built-in module 'itertools' which will
+# hide this one if compiled in.
+
"""Functional tools for creating and using iterators.
Infinite iterators:
Modified: pypy/dist/pypy/lib/marshal.py
==============================================================================
--- pypy/dist/pypy/lib/marshal.py (original)
+++ pypy/dist/pypy/lib/marshal.py Wed Aug 20 17:36:32 2008
@@ -1,3 +1,5 @@
-# temporary
+# Note that PyPy contains also a built-in module 'marshal' which will
+# hide this one if compiled in.
+
from _marshal import __doc__
from _marshal import *
Modified: pypy/dist/pypy/lib/md5.py
==============================================================================
--- pypy/dist/pypy/lib/md5.py (original)
+++ pypy/dist/pypy/lib/md5.py Wed Aug 20 17:36:32 2008
@@ -1,6 +1,9 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
+# Note that PyPy contains also a built-in module 'md5' which will hide
+# this one if compiled in.
+
"""A sample implementation of MD5 in pure Python.
This is an implementation of the MD5 hash function, as specified by
Modified: pypy/dist/pypy/lib/readline.py
==============================================================================
--- pypy/dist/pypy/lib/readline.py (original)
+++ pypy/dist/pypy/lib/readline.py Wed Aug 20 17:36:32 2008
@@ -5,4 +5,9 @@
Note that some of the functions present in the CPython module 'readline'
are only stubs at the moment.
"""
+
+# Note that PyPy contains also a built-in module 'readline' which will hide
+# this one if compiled in. However the built-in module is incomplete;
+# don't use it.
+
from pyrepl.readline import *
Modified: pypy/dist/pypy/lib/sha.py
==============================================================================
--- pypy/dist/pypy/lib/sha.py (original)
+++ pypy/dist/pypy/lib/sha.py Wed Aug 20 17:36:32 2008
@@ -1,6 +1,9 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1
+# Note that PyPy contains also a built-in module 'sha' which will hide
+# this one if compiled in.
+
"""A sample implementation of SHA-1 in pure Python.
Framework adapted from Dinu Gherman's MD5 implementation by
More information about the Pypy-commit
mailing list