[pypy-svn] r55196 - in pypy/dist/pypy/module: __builtin__ sys

[xoraxax at codespeak.net]

Author: xoraxax
Date: Sat May 24 23:50:50 2008
New Revision: 55196

Removed:
   pypy/dist/pypy/module/__builtin__/app_help.py
Modified:
   pypy/dist/pypy/module/__builtin__/__init__.py
   pypy/dist/pypy/module/sys/app.py
Log:
Merged CPython's copyright string into PyPy's (mainly because PyPy is using their stdlib etc.), removed the duplicated code in app_help. Note that site.py is implementing those names.

Modified: pypy/dist/pypy/module/__builtin__/__init__.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/__init__.py	(original)
+++ pypy/dist/pypy/module/__builtin__/__init__.py	Sat May 24 23:50:50 2008
@@ -23,12 +23,6 @@
     expose__file__attribute = False
 
     appleveldefs = {
-        'quit'          : 'app_help.exit',
-        'exit'          : 'app_help.exit',
-        'copyright'     : 'app_help.copyright',
-        'license'       : 'app_help.license',
-        'help'          : 'app_help.help',
-
         'execfile'      : 'app_io.execfile',
         'raw_input'     : 'app_io.raw_input',
         'input'         : 'app_io.input',

Modified: pypy/dist/pypy/module/sys/app.py
==============================================================================
--- pypy/dist/pypy/module/sys/app.py	(original)
+++ pypy/dist/pypy/module/sys/app.py	Sat May 24 23:50:50 2008
@@ -46,6 +46,16 @@
 Copyright 2003-2008 PyPy development team.
 All rights reserved.
 For further information see http://www.codespeak.net/pypy.
-Some materials may have a different copyright.
-In these cases, this is explicitly noted in the source code file.
+
+Portions Copyright (c) 2001-2008 Python Software Foundation.
+All Rights Reserved.
+
+Portions Copyright (c) 2000 BeOpen.com.
+All Rights Reserved.
+
+Portions Copyright (c) 1995-2001 Corporation for National Research Initiatives.
+All Rights Reserved.
+
+Portions Copyright (c) 1991-1995 Stichting Mathematisch Centrum, Amsterdam.
+All Rights Reserved.
 """