[Zope-Checkins] SVN: Zope/trunk/ Zope/branches/ajung-docutils-integration -r 28840:28841

[Andreas Jung]

Log message for revision 28842:
  Zope/branches/ajung-docutils-integration -r 28840:28841

Changed:
  U   Zope/trunk/lib/python/OFS/ObjectManager.py
  A   Zope/trunk/lib/python/docutils/
  D   Zope/trunk/lib/python/sitecustomize.py
  U   Zope/trunk/setup.py

-=-
Modified: Zope/trunk/lib/python/OFS/ObjectManager.py
===================================================================
--- Zope/trunk/lib/python/OFS/ObjectManager.py	2005-01-15 15:47:16 UTC (rev 28841)
+++ Zope/trunk/lib/python/OFS/ObjectManager.py	2005-01-15 16:15:26 UTC (rev 28842)
@@ -664,6 +664,8 @@
                     ):
                     mode=mode | 0770
             except: pass
+            import pdb
+            pdb.set_trace()
             if nobody.allowed(
                 self.manage_FTPlist,
                 getRoles(self, 'manage_FTPlist', self.manage_FTPlist, ()),

Copied: Zope/trunk/lib/python/docutils (from rev 28841, Zope/branches/ajung-docutils-integration/lib/python/docutils)

Deleted: Zope/trunk/lib/python/sitecustomize.py
===================================================================
--- Zope/trunk/lib/python/sitecustomize.py	2005-01-15 15:47:16 UTC (rev 28841)
+++ Zope/trunk/lib/python/sitecustomize.py	2005-01-15 16:15:26 UTC (rev 28842)
@@ -1,4 +0,0 @@
-import sys, os
-dirname = os.path.dirname(__file__)
-sys.path.append(os.path.join(dirname, 'third_party', 'docutils'))
-sys.path.append(os.path.join(dirname, 'third_party', 'docutils', 'extras'))

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2005-01-15 15:47:16 UTC (rev 28841)
+++ Zope/trunk/setup.py	2005-01-15 16:15:26 UTC (rev 28842)
@@ -281,14 +281,14 @@
                   sources=['DocumentTemplate/cDocumentTemplate.c'])]
     )
 
-# third_party.docutils.docutils
+# docutils
 setup(
-    name='third_party.docutils.docutils',
+    name='docutils',
     author='David Goodger and contributors',
-    packages=['third_party.docutils.docutils', 'third_party.docutils.docutils.languages', 'third_party.docutils.docutils.parsers',
-              'third_party.docutils.docutils.parsers.rst', 'third_party.docutils.docutils.parsers.rst.directives',
-              'third_party.docutils.docutils.parsers.rst.languages', 'third_party.docutils.docutils.readers',
-              'third_party.docutils.docutils.transforms', 'third_party.docutils.docutils.writers'],
+    packages=['docutils', 'docutils.languages', 'docutils.parsers',
+              'docutils.parsers.rst', 'docutils.parsers.rst.directives',
+              'docutils.parsers.rst.languages', 'docutils.readers',
+              'docutils.transforms', 'docutils.writers'],
     )
 
 # ExtensionClass
@@ -1080,14 +1080,7 @@
                 ['ZServer/medusa/test', ['ZServer/medusa/test/*.txt']]],
     )
 
-setup(
-    name='Site Customization',
-    author=AUTHOR,
 
-    data_files=[['', ['sitecustomize.py']],
-               ]
-    )
-
 # Call distutils setup with all lib/python packages and modules, and
 # flush setup_info.  Wondering why we run py_modules separately?  So am I.
 # Distutils won't let us specify packages and py_modules in the same call.