moved docutils to lib/python/third_party

setup.py

@@ -281,14 +281,14 @@ setup(
                   sources=['DocumentTemplate/cDocumentTemplate.c'])]
     )
 
-# docutils
+# third_party.docutils.docutils
 setup(
-    name='docutils',
+    name='third_party.docutils.docutils',
     author='David Goodger and contributors',
-    packages=['docutils', 'docutils.languages', 'docutils.parsers',
-              'docutils.parsers.rst', 'docutils.parsers.rst.directives',
-              'docutils.parsers.rst.languages', 'docutils.readers',
-              'docutils.transforms', 'docutils.writers'],
+    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'],
     )
 
 # ExtensionClass

skel/bin/runzope.bat.in

@@ -3,6 +3,6 @@
 @set INSTANCE_HOME=<<INSTANCE_HOME>>
 @set SOFTWARE_HOME=<<SOFTWARE_HOME>>
 @set CONFIG_FILE=<<INSTANCE_HOME>>\etc\zope.conf
-@set PYTHONPATH=%SOFTWARE_HOME%
+@set PYTHONPATH=%SOFTWARE_HOME%:%SOFTWARE_HOME%\third_party/docutils:%SOFTWARE_HOME%\third_party\docutils\extras
 @set ZOPE_RUN=%SOFTWARE_HOME%\Zope\Startup\run.py
 "%PYTHON%" "%ZOPE_RUN%" -C "%CONFIG_FILE%" %1 %2 %3 %4 %5 %6 %7

skel/bin/runzope.in

@@ -5,7 +5,7 @@ ZOPE_HOME="<<ZOPE_HOME>>"
 INSTANCE_HOME="<<INSTANCE_HOME>>"
 CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
 SOFTWARE_HOME="<<SOFTWARE_HOME>>"
-PYTHONPATH="$SOFTWARE_HOME"
+PYTHONPATH="$SOFTWARE_HOME:$SOFTWARE_HOME/third_party/docutils:$SOFTWARE_HOME/third_party/docutils/extras"
 export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
 
 ZOPE_RUN="$SOFTWARE_HOME/Zope/Startup/run.py"

skel/bin/zopectl.in

@@ -5,7 +5,7 @@ ZOPE_HOME="<<ZOPE_HOME>>"
 INSTANCE_HOME="<<INSTANCE_HOME>>"
 CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
 SOFTWARE_HOME="<<SOFTWARE_HOME>>"
-PYTHONPATH="$SOFTWARE_HOME"
+PYTHONPATH="$SOFTWARE_HOME:$SOFTWARE_HOME/third_party/docutils:$SOFTWARE_HOME/third_party/docutils/extras"
 export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
 
 ZDCTL="$SOFTWARE_HOME/Zope/Startup/zopectl.py"

skel/bin/zopeservice.py.in

@@ -96,6 +96,8 @@ CONFIG_FILE= os.path.join(INSTANCE_HOME, 'etc', 'zope.conf')
 PYTHONSERVICE_EXE=r'%s\bin\PythonService.exe' % ZOPE_HOME
 
 sys.path.insert(0, SOFTWARE_HOME)
+sys.path.insert(1, os.path.join(SOFTWARE_HOME, 'third_party', 'docutils'))
+sys.path.insert(2, os.path.join(SOFTWARE_HOME, 'third_party', 'docutils', 'extras'))
 
 from nt_svcutils.service import Service