Fixed setup.py for the restsrv -> process change, plus fixed a couple svn props.

3 files changed, 41 insertions, 33 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 5e6c26de..83d99d19 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,13 @@
+include cherrypy/cherryd

 include cherrypy/favicon.ico

 include cherrypy/LICENSE.txt

-include cherrypy/tutorial/*.conf

-include cherrypy/tutorial/*.pdf

-include cherrypy/tutorial/*.html

-include cherrypy/tutorial/README.txt

+include cherrypy/scaffold/*.conf

+include cherrypy/scaffold/static/*.png

 include cherrypy/test/style.css

 include cherrypy/test/test.pem

 include cherrypy/test/static/*.html

 include cherrypy/test/static/*.jpg

-include cherrypy/restsrv/restctl.sh

+include cherrypy/tutorial/*.conf

+include cherrypy/tutorial/*.pdf

+include cherrypy/tutorial/*.html

+include cherrypy/tutorial/README.txt

diff --git a/cherrypy/test/test_refleaks.py b/cherrypy/test/test_refleaks.py
index 858e913b..07a0fc5b 100644
--- a/cherrypy/test/test_refleaks.py
+++ b/cherrypy/test/test_refleaks.py
@@ -4,9 +4,9 @@ from cherrypy.test import test
 test.prefer_parent_path()
 
 import gc
-import httplib

+import httplib
 import threading
-

+
 import cherrypy
 from cherrypy import _cprequest
 
@@ -86,16 +86,16 @@ class ReferenceTests(helper.CPWebCase):
     
     def test_threadlocal_garbage(self):
         def getpage():
-            if self.scheme == 'https':

-                c = httplib.HTTPSConnection('127.0.0.1:%s' % self.PORT)

-            else:

-                c = httplib.HTTPConnection('127.0.0.1:%s' % self.PORT)

-            try:

-                c.request('GET', '/')

-                resp = c.getresponse()

-                self.assertEqual(resp.status, 200)

-                self.assertEqual(resp.read(), "Hello world!")

-            finally:

+            if self.scheme == 'https':
+                c = httplib.HTTPSConnection('127.0.0.1:%s' % self.PORT)
+            else:
+                c = httplib.HTTPConnection('127.0.0.1:%s' % self.PORT)
+            try:
+                c.request('GET', '/')
+                resp = c.getresponse()
+                self.assertEqual(resp.status, 200)
+                self.assertEqual(resp.read(), "Hello world!")
+            finally:
                 c.close()
         
         ts = []
@@ -108,9 +108,9 @@ class ReferenceTests(helper.CPWebCase):
             t.join()
         
         self.getPage("/gc_stats")
-        self.assertBody("")

-

-

+        self.assertBody("")
+
+
 if __name__ == '__main__':
     setup_server()
     helper.testmain()
diff --git a/setup.py b/setup.py
index c8078541..04fa911a 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ classifiers=[
     "Development Status :: 4 - Beta",
     "Environment :: Web Environment",
     "Intended Audience :: Developers",
-    "License :: Freely Distributable",

+    "License :: Freely Distributable",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
@@ -38,11 +38,26 @@ url="http://www.cherrypy.org"
 cp_license="BSD"
 packages=[
     "cherrypy", "cherrypy.lib",
-    "cherrypy.tutorial", "cherrypy.test",

-    "cherrypy.wsgiserver", "cherrypy.restsrv",
+    "cherrypy.tutorial", "cherrypy.test",
+    "cherrypy.wsgiserver", "cherrypy.process",
 ]
 download_url="http://download.cherrypy.org/cherrypy/3.1.0beta3/"
 data_files=[
+    ('cherrypy', ['cherrypy/cherryd',
+                  'cherrypy/favicon.ico',
+                  'cherrypy/LICENSE.txt',
+                  ]),
+    ('cherrypy/process', []),
+    ('cherrypy/scaffold', ['cherrypy/scaffold/example.conf',
+                           'cherrypy/scaffold/site.conf',
+                           ]),
+    ('cherrypy/scaffold/static', ['made_with_cherrypy_small.png',
+                                  ]),
+    ('cherrypy/test', ['cherrypy/test/style.css',
+                       'cherrypy/test/test.pem',
+                       ]),
+    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
+                              'cherrypy/test/static/dirback.jpg',]),
     ('cherrypy/tutorial',
         [
             'cherrypy/tutorial/tutorial.conf',
@@ -51,15 +66,6 @@ data_files=[
             'cherrypy/tutorial/custom_error.html',
         ]
     ),
-    ('cherrypy', ['cherrypy/favicon.ico',

-                  'cherrypy/LICENSE.txt',

-                  ]),
-    ('cherrypy/restsrv', ['cherrypy/restsrv/restctl.sh',]),
-    ('cherrypy/test', ['cherrypy/test/style.css',

-                       'cherrypy/test/test.pem',

-                       ]),
-    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
-                              'cherrypy/test/static/dirback.jpg',]),
 ]
 ###############################################################################
 # end arguments for setup
@@ -71,7 +77,7 @@ def main():
         s = "I'm sorry, but %s %s requires Python %s or later."
         print s % (name, version, required_python_version)
         sys.exit(1)
-    # set default location for "data_files" to

+    # set default location for "data_files" to
     # platform specific "site-packages" location
     for scheme in INSTALL_SCHEMES.values():
         scheme['data'] = scheme['purelib']