Whitespace and additional git ignores.

.gitignore

@@ -12,7 +12,10 @@ develop/
 develop-eggs/
 dist/
 eggs/
+etc/
 include/
 lib/
+log/
 parts/
+var/
 doc/_build/

MANIFEST.in

 include *.txt
+include *.rst
 
 recursive-include doc *
 recursive-include src *

setup.py

@@ -22,15 +22,16 @@ if sys.platform[:3].lower() == "win":
     additional_install_requires += ['nt_svcutils']
 
 
-setup(name='Zope2',
+setup(
+    name='Zope2',
     version='2.13.25.dev0',
     url='http://zope2.zope.org',
     license='ZPL 2.1',
     description='Zope2 application server / web framework',
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
-    long_description=file("README.txt").read() + "\n" +
-                     file(os.path.join("doc", "CHANGES.rst")).read(),
+    long_description=(open("README.txt").read() + "\n" +
+                      open(os.path.join("doc", "CHANGES.rst")).read()),
     classifiers=[
         'Development Status :: 6 - Mature',
         "Environment :: Web Environment",
@@ -47,89 +48,89 @@ setup(name='Zope2',
     namespace_packages=['Products', 'Shared', 'Shared.DC'],
     package_dir={'': 'src'},
     install_requires=[
-      'AccessControl>=2.13.2',
-      'Acquisition',
-      'DateTime',
-      'DocumentTemplate',
-      'ExtensionClass',
-      'Missing',
-      'MultiMapping',
-      'Persistence',
-      'Products.OFSP >= 2.13.2',  # folded back into Zope 4.0
-      'RestrictedPython',
-      'ZConfig',
-      'ZODB3',
-      'ZopeUndo',
-      'docutils',
-      'pytz',
-      'setuptools',
-      'tempstorage',
-      'transaction',
-      'zdaemon',
-      'zExceptions',
-      'zLOG',
-      'zope.browser',
-      'zope.browsermenu',
-      'zope.browserpage',
-      'zope.browserresource',
-      'zope.component',
-      'zope.configuration',
-      'zope.container',
-      'zope.contentprovider',
-      'zope.contenttype',
-      'zope.deferredimport',
-      'zope.event',
-      'zope.exceptions',
-      'zope.i18n [zcml]',
-      'zope.i18nmessageid',
-      'zope.interface',
-      'zope.lifecycleevent',
-      'zope.location',
-      'zope.pagetemplate',
-      'zope.processlifetime',
-      'zope.proxy',
-      'zope.ptresource',
-      'zope.publisher',
-      'zope.schema',
-      'zope.security',
-      'zope.sendmail',
-      'zope.sequencesort',
-      'zope.site',
-      'zope.size',
-      'zope.structuredtext',
-      'zope.tal',
-      'zope.tales >= 3.5.0',
-      'zope.testbrowser',
-      'zope.testing',
-      'zope.traversing',
-      'zope.viewlet',
-      # BBB optional dependencies to be removed in Zope 4.0
-      'initgroups',
-      'Products.BTreeFolder2',
-      'Products.ExternalMethod',
-      'Products.MailHost',
-      'Products.MIMETools',
-      'Products.PythonScripts',
-      'Products.Sessions',
-      'Products.StandardCacheManagers',
-      'Products.TemporaryFolder',
-      'Products.ZCatalog',
-      'Products.ZCTextIndex',
-      'Record',
+        'AccessControl>=2.13.2',
+        'Acquisition',
+        'DateTime',
+        'DocumentTemplate',
+        'ExtensionClass',
+        'Missing',
+        'MultiMapping',
+        'Persistence',
+        'Products.OFSP >= 2.13.2',  # folded back into Zope 4.0
+        'RestrictedPython',
+        'ZConfig',
+        'ZODB3',
+        'ZopeUndo',
+        'docutils',
+        'pytz',
+        'setuptools',
+        'tempstorage',
+        'transaction',
+        'zdaemon',
+        'zExceptions',
+        'zLOG',
+        'zope.browser',
+        'zope.browsermenu',
+        'zope.browserpage',
+        'zope.browserresource',
+        'zope.component',
+        'zope.configuration',
+        'zope.container',
+        'zope.contentprovider',
+        'zope.contenttype',
+        'zope.deferredimport',
+        'zope.event',
+        'zope.exceptions',
+        'zope.i18n [zcml]',
+        'zope.i18nmessageid',
+        'zope.interface',
+        'zope.lifecycleevent',
+        'zope.location',
+        'zope.pagetemplate',
+        'zope.processlifetime',
+        'zope.proxy',
+        'zope.ptresource',
+        'zope.publisher',
+        'zope.schema',
+        'zope.security',
+        'zope.sendmail',
+        'zope.sequencesort',
+        'zope.site',
+        'zope.size',
+        'zope.structuredtext',
+        'zope.tal',
+        'zope.tales >= 3.5.0',
+        'zope.testbrowser',
+        'zope.testing',
+        'zope.traversing',
+        'zope.viewlet',
+        # BBB optional dependencies to be removed in Zope 4.0
+        'initgroups',
+        'Products.BTreeFolder2',
+        'Products.ExternalMethod',
+        'Products.MailHost',
+        'Products.MIMETools',
+        'Products.PythonScripts',
+        'Products.Sessions',
+        'Products.StandardCacheManagers',
+        'Products.TemporaryFolder',
+        'Products.ZCatalog',
+        'Products.ZCTextIndex',
+        'Record',
     ] + additional_install_requires,
 
     include_package_data=True,
     zip_safe=False,
     entry_points={
-       'paste.app_factory': [
-          'main=Zope2.Startup.run:make_wsgi_app',
-       ],
-       'console_scripts': [
-          'mkzopeinstance=Zope2.utilities.mkzopeinstance:main',
-          'runzope=Zope2.Startup.run:run',
-          'zopectl=Zope2.Startup.zopectl:run',
-          'zpasswd=Zope2.utilities.zpasswd:main',
-          'addzope2user=Zope2.utilities.adduser:main',
-      ],
+        'paste.app_factory': [
+            'main=Zope2.Startup.run:make_wsgi_app',
+        ],
+        'console_scripts': [
+            'mkzopeinstance=Zope2.utilities.mkzopeinstance:main',
+            'runzope=Zope2.Startup.run:run',
+            'zopectl=Zope2.Startup.zopectl:run',
+            'zpasswd=Zope2.utilities.zpasswd:main',
+            'addzope2user=Zope2.utilities.adduser:main',
+        ],
     },
 )