[py-svn] r13447 - in py/dist/py: . compat compat/testing misc/testing

[dstanek at codespeak.net]

Author: dstanek
Date: Wed Jun 15 19:17:01 2005
New Revision: 13447

Added:
   py/dist/py/compat/conftest.py   (props changed)
      - copied unchanged from r13444, py/branch/dist-doctest/py/compat/conftest.py
   py/dist/py/compat/testing/   (props changed)
      - copied from r13444, py/branch/dist-doctest/py/compat/testing/
   py/dist/py/compat/testing/test_doctest.py   (props changed)
      - copied unchanged from r13444, py/branch/dist-doctest/py/compat/testing/test_doctest.py
   py/dist/py/compat/testing/test_doctest.txt   (props changed)
      - copied unchanged from r13444, py/branch/dist-doctest/py/compat/testing/test_doctest.txt
   py/dist/py/compat/testing/test_doctest2.py   (props changed)
      - copied unchanged from r13444, py/branch/dist-doctest/py/compat/testing/test_doctest2.py
   py/dist/py/compat/testing/test_doctest2.txt   (props changed)
      - copied unchanged from r13444, py/branch/dist-doctest/py/compat/testing/test_doctest2.txt
   py/dist/py/compat/testing/test_optparse.py   (props changed)
      - copied unchanged from r13444, py/branch/dist-doctest/py/compat/testing/test_optparse.py
   py/dist/py/compat/testing/test_textwrap.py   (props changed)
      - copied unchanged from r13444, py/branch/dist-doctest/py/compat/testing/test_textwrap.py
Modified:
   py/dist/py/__init__.py
   py/dist/py/compat/__init__.py   (props changed)
   py/dist/py/compat/doctest.py   (props changed)
   py/dist/py/compat/optparse.py   (props changed)
   py/dist/py/compat/textwrap.py   (contents, props changed)
   py/dist/py/initpkg.py
   py/dist/py/misc/testing/test_initpkg.py
Log:
Merged dist-doctest branch (-r13294:13384) into dist.
The changeset added support for Python compatibility modules. See issue 8.


Modified: py/dist/py/__init__.py
==============================================================================
--- py/dist/py/__init__.py	(original)
+++ py/dist/py/__init__.py	Wed Jun 15 19:17:01 2005
@@ -117,4 +117,8 @@
     'log.Email'              : ('./log/consumer.py', 'Email'),
     'log.Syslog'             : ('./log/consumer.py', 'Syslog'),     
     'log.WinEvent'           : ('./log/consumer.py', 'WinEvent'),     
+
+    'compat.doctest'         : ('./compat/doctest.py', None),
+    'compat.optparse'        : ('./compat/optparse.py', None),
+    'compat.textwrap'        : ('./compat/textwrap.py', None),
 })

Modified: py/dist/py/compat/textwrap.py
==============================================================================
--- py/dist/py/compat/textwrap.py	(original)
+++ py/dist/py/compat/textwrap.py	Wed Jun 15 19:17:01 2005
@@ -5,7 +5,7 @@
 # Copyright (C) 2002, 2003 Python Software Foundation.
 # Written by Greg Ward <gward at python.net>
 
-__revision__ = "$Id: textwrap.py,v 1.35.4.1 2005/03/05 02:38:32 gward Exp $"
+__revision__ = "$Id$"
 
 import string, re
 

Modified: py/dist/py/initpkg.py
==============================================================================
--- py/dist/py/initpkg.py	(original)
+++ py/dist/py/initpkg.py	Wed Jun 15 19:17:01 2005
@@ -66,6 +66,9 @@
         assert fspath.startswith('./'), \
                "%r is not an implementation path (XXX)" % (extpyish,)
         implmodule = self._loadimpl(fspath[:-3])
+        if not modpath: # export the entire module
+            return implmodule
+
         current = implmodule
         for x in modpath.split('.'):
             try: 

Modified: py/dist/py/misc/testing/test_initpkg.py
==============================================================================
--- py/dist/py/misc/testing/test_initpkg.py	(original)
+++ py/dist/py/misc/testing/test_initpkg.py	Wed Jun 15 19:17:01 2005
@@ -48,6 +48,7 @@
         base.join('magic', 'greenlet.py'), 
         base.join('bin'),
         base.join('execnet', 'script'),
+        base.join('compat'),
     )
     for p in base.visit('*.py', py.path.checker(dotfile=0)):
         relpath = p.new(ext='').relto(base)