Robert Brewer avatar Robert Brewer committed 1cd792a

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

Comments (0)

Files changed (3)

+include cherrypy/cherryd
 include cherrypy/favicon.ico
 include cherrypy/LICENSE.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/tutorial/*.conf
 include cherrypy/tutorial/*.pdf
 include cherrypy/tutorial/*.html
 include cherrypy/tutorial/README.txt
-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

cherrypy/test/test_refleaks.py

 test.prefer_parent_path()
 
 import gc
-import httplib
+import httplib
 import threading
-
+
 import cherrypy
 from cherrypy import _cprequest
 
     
     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 = []
             t.join()
         
         self.getPage("/gc_stats")
-        self.assertBody("")
-
-
+        self.assertBody("")
+
+
 if __name__ == '__main__':
     setup_server()
     helper.testmain()
     "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",
 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',
             '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
         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']
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.