From f0c006f5de16796a9d31fd241b19761f0991df2f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Jun 20 2014 16:30:11 +0000 Subject: Package is retired --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5c3a7d2..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -CherryPy-2.3.0.tar.gz diff --git a/README.fedora b/README.fedora deleted file mode 100644 index 37e9a26..0000000 --- a/README.fedora +++ /dev/null @@ -1,88 +0,0 @@ -============ -CherryPy 2.x -============ - -CherryPy 2.x for Fedora is being provided so that apps written for -TurboGears 1.x can continue to run. It relies on eggs to enable multiple -versions to be installed. - -If you are using CherryPy via TurboGears, everything should work out of the -box for new projects quickstarted with the Fedora 8 packages. Existing projects -will need a small adjustment to run correctly. In your project's start-APP.py -script you need to change the commands that import TurboGears from this:: - - import pkg_resources - pkg_resources.require('TurboGears') - -to this:: - - __requires__ = 'TurboGears' - import pkg_resources - -with the packages provided by Fedora 8+. - -If you are using CherryPY via your own code and absolutely must use the 2.x -version rather than 3.x, you will need to do one of the following to make it -work in your code: - -1) Manually change your python path to place the egg directory before - site-packages. Note that if you do it this way you will either have to - change your code whenever a new version comes out (for instance, if a - bugfix release, CherryPy-2.3.1, is released.) The code would look - something like this:: - - import sys, os - from distutils.sysconfig import get_python_lib - compatCherryPyPath = os.path.join( - get_python_lib(), 'CherryPy-2.3.0-py2.5.egg') - sys.path.insert(0, compatCherryPyPath) - import cherrypy - -2) Use setuptools and entrypoints. To do this you have a function in a python - module that is your main function. You define this as an entry point in - setup.py. For instance, if you wanted your script to be called - "nifty-foo" and the entry point was the main() function in the module - nifty.foo, you would use this in setup.py:: - - # List the versions of CherryPy that will work - install_requires = [ - 'CherryPy >= 2.2,<3.0alpha' - ] - # Add the information necessary to create the script that requires - # the CherryPy version - setup ( - name='Nifty', - version='1.0', - entry_points = ''' - [console_scripts] - nifty-foo = nifty.foo:main - ''', - [...] - - When you use setup.py to install this script it will create a script that - looks like this:: - - #!/usr/bin/python - __requires__ = 'Nifty==1.0' - import sys - from pkg_resources import load_entry_point - - sys.exit( - load_entry_point('Nifty==1.0', 'console_scripts', 'nifty-foo')() - ) - - The script in turn, references the egg metadata for your module which - lists the dependency from Nifty to CherryPy>=2.2, < 3.0alpha. - -Note that although there may be other methods of making this work in some -circumstances, these are the only methods that the setuptools author and -we are able to say will work in all circumstances in this environment. Other -methods may not work reliably in some versions of setuptools. - -In particular, if you have both the python-cherrypy (at version 3.x) and -python-cherrypy2 packages installed, this will not work:: - - from pkg_resources import require - require("CherryPy>=2.3,<3.0alpha") - import cherrypy - print cherrypy.__version__ diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..0f98991 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired diff --git a/python-cherrypy-2.3.0-EINTR.patch b/python-cherrypy-2.3.0-EINTR.patch deleted file mode 100644 index 774bd4c..0000000 --- a/python-cherrypy-2.3.0-EINTR.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak CherryPy-2.3.0/cherrypy/_cpwsgiserver.py ---- CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak 2008-01-17 15:57:48.000000000 -0800 -+++ CherryPy-2.3.0/cherrypy/_cpwsgiserver.py 2008-01-17 15:59:32.000000000 -0800 -@@ -404,6 +404,13 @@ class CherryPyWSGIServer(object): - # accept() by default - return - except socket.error, x: -+ if hasattr(errno, "EINTR") and x.args[0] == errno.EINTR: -+ # I *think* this is right. EINTR should occur when a signal -+ # is received during the accept() call; all docs say retry -+ # the call, and I *think* I'm reading it right that Python -+ # will then go ahead and poll for and handle the signal -+ # elsewhere. See http://www.cherrypy.org/ticket/707. -+ return - msg = x.args[1] - if msg == "Bad file descriptor": - # Our socket was closed diff --git a/python-cherrypy-2.3.0-EPIPE.patch b/python-cherrypy-2.3.0-EPIPE.patch deleted file mode 100644 index 3825cd2..0000000 --- a/python-cherrypy-2.3.0-EPIPE.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- CherryPy-2.3.0.orig/cherrypy/_cpwsgiserver.py 2008-01-14 12:20:11.000000000 +1000 -+++ CherryPy-2.3.0.orig/cherrypy/_cpwsgiserver.py 2012-02-21 15:24:54.151563814 +1000 -@@ -204,13 +204,17 @@ - self.wfile.flush() - - def terminate(self): -- if self.ready and not self.sent_headers and not self.server.interrupt: -- self.sent_headers = True -- self.send_headers() -- self.rfile.close() -- self.wfile.close() -- self.socket.close() -- -+ try: -+ if self.ready and not self.sent_headers and not self.server.interrupt: -+ self.sent_headers = True -+ self.send_headers() -+ self.rfile.close() -+ self.wfile.close() -+ self.socket.close() -+ except socket.error, e: -+ errno = e.args[0] -+ if errno not in socket_errors_to_ignore: -+ traceback.print_exc() - - _SHUTDOWNREQUEST = None - diff --git a/python-cherrypy-2.3.0-broken_tests.patch b/python-cherrypy-2.3.0-broken_tests.patch deleted file mode 100644 index d95b776..0000000 --- a/python-cherrypy-2.3.0-broken_tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up CherryPy-2.3.0/cherrypy/test/webtest.py.broken_tests CherryPy-2.3.0/cherrypy/test/webtest.py ---- CherryPy-2.3.0/cherrypy/test/webtest.py.broken_tests 2010-07-28 18:31:14.000000000 +0200 -+++ CherryPy-2.3.0/cherrypy/test/webtest.py 2010-07-28 18:31:53.000000000 +0200 -@@ -485,7 +485,7 @@ def openURL(url, headers=None, method="G - skip_accept_encoding=True) - - for key, value in headers: -- conn.putheader(key, value) -+ conn.putheader(key, str(value)) - conn.endheaders() - - if body is not None: diff --git a/python-cherrypy-2.3.0-py26-test.patch b/python-cherrypy-2.3.0-py26-test.patch deleted file mode 100644 index 676035c..0000000 --- a/python-cherrypy-2.3.0-py26-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up CherryPy-2.3.0/cherrypy/test/test_core.py.py26 CherryPy-2.3.0/cherrypy/test/test_core.py ---- CherryPy-2.3.0/cherrypy/test/test_core.py.py26 2008-12-01 11:28:19.000000000 -0800 -+++ CherryPy-2.3.0/cherrypy/test/test_core.py 2008-12-01 11:28:36.000000000 -0800 -@@ -52,7 +52,7 @@ def setup_server(): - and adds an instance of the subclass as an attribute of cherrypy.root. - """ - def __init__(cls, name, bases, dct): -- type.__init__(name, bases, dct) -+ type.__init__(cls, name, bases, dct) - for value in dct.itervalues(): - if isinstance(value, types.FunctionType): - value.exposed = True -diff -up CherryPy-2.3.0/cherrypy/test/test_custom_filters.py.py26 CherryPy-2.3.0/cherrypy/test/test_custom_filters.py ---- CherryPy-2.3.0/cherrypy/test/test_custom_filters.py.py26 2008-12-01 11:28:29.000000000 -0800 -+++ CherryPy-2.3.0/cherrypy/test/test_custom_filters.py 2008-12-01 11:28:49.000000000 -0800 -@@ -79,7 +79,7 @@ def setup_server(): - and adds an instance of the subclass as an attribute of cherrypy.root. - """ - def __init__(cls, name, bases, dct): -- type.__init__(name, bases, dct) -+ type.__init__(cls, name, bases, dct) - for value in dct.itervalues(): - if isinstance(value, types.FunctionType): - value.exposed = True diff --git a/python-cherrypy-2.3.0-py27_exceptions.patch b/python-cherrypy-2.3.0-py27_exceptions.patch deleted file mode 100644 index 38d07bf..0000000 --- a/python-cherrypy-2.3.0-py27_exceptions.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up CherryPy-2.3.0/cherrypy/test/webtest.py.py27_exceptions CherryPy-2.3.0/cherrypy/test/webtest.py ---- CherryPy-2.3.0/cherrypy/test/webtest.py.py27_exceptions 2010-08-02 14:27:29.000000000 +0200 -+++ CherryPy-2.3.0/cherrypy/test/webtest.py 2010-08-02 14:34:04.000000000 +0200 -@@ -251,7 +251,7 @@ class WebCase(TestCase): - except (KeyboardInterrupt, SystemExit): - raise - except: -- result.addError(self, self._exc_info()) -+ result.addError(self, sys.exc_info()) - return - - ok = 0 -@@ -259,18 +259,18 @@ class WebCase(TestCase): - testMethod() - ok = 1 - except self.failureException: -- result.addFailure(self, self._exc_info()) -+ result.addFailure(self, sys.exc_info()) - except (KeyboardInterrupt, SystemExit): - raise - except: -- result.addError(self, self._exc_info()) -+ result.addError(self, sys.exc_info()) - - try: - self.tearDown() - except (KeyboardInterrupt, SystemExit): - raise - except: -- result.addError(self, self._exc_info()) -+ result.addError(self, sys.exc_info()) - ok = 0 - if ok: - result.addSuccess(self) diff --git a/python-cherrypy-deprecation.patch b/python-cherrypy-deprecation.patch deleted file mode 100644 index 228ba81..0000000 --- a/python-cherrypy-deprecation.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: CherryPy-2.3.0/cherrypy/lib/cptools.py -=================================================================== ---- CherryPy-2.3.0.orig/cherrypy/lib/cptools.py -+++ CherryPy-2.3.0/cherrypy/lib/cptools.py -@@ -1,6 +1,8 @@ - """Tools which both CherryPy and application developers may invoke.""" -- --import md5 -+try: -+ from hashlib import md5 -+except ImportError: -+ from md5 import new as md5 - import mimetools - import mimetypes - mimetypes.init() -@@ -99,7 +101,7 @@ def validate_etags(autotags=False): - if (not etag) and autotags: - if status == 200: - etag = response.collapse_body() -- etag = '"%s"' % md5.new(etag).hexdigest() -+ etag = '"%s"' % md5(etag).hexdigest() - response.headers['ETag'] = etag - - response.ETag = etag -Index: CherryPy-2.3.0/cherrypy/filters/sessionfilter.py -=================================================================== ---- CherryPy-2.3.0.orig/cherrypy/filters/sessionfilter.py -+++ CherryPy-2.3.0/cherrypy/filters/sessionfilter.py -@@ -30,7 +30,11 @@ try: - except ImportError: - import pickle - import random --import sha -+try: -+ from hashlib import sha1 -+except ImportError: -+ from sha import new as sha1 -+ - import time - import thread - import threading -@@ -450,7 +454,7 @@ except (AttributeError, NotImplementedEr - # os.urandom not available until Python 2.4. Fall back to random.random. - def generate_session_id(): - """Return a new session id.""" -- return sha.new('%s' % random.random()).hexdigest() -+ return sha1('%s' % random.random()).hexdigest() - else: - def generate_session_id(): - """Return a new session id.""" diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch deleted file mode 100644 index 3f0b1c4..0000000 --- a/python-cherrypy-tutorial-doc.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up CherryPy-2.3.0/setup.py.bak CherryPy-2.3.0/setup.py ---- CherryPy-2.3.0/setup.py.bak 2008-01-17 14:37:31.000000000 -0800 -+++ CherryPy-2.3.0/setup.py 2008-01-17 14:38:06.000000000 -0800 -@@ -36,23 +36,11 @@ url="http://www.cherrypy.org" - cp_license="BSD" - packages=[ - "cherrypy", "cherrypy.lib", "cherrypy.lib.filter", -- "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters", -+ "cherrypy.filters", - ] - download_url="http://download.cherrypy.org/cherrypy/2.3.0/" - data_files=[ -- ('cherrypy/tutorial', -- [ -- 'cherrypy/tutorial/tutorial.conf', -- 'cherrypy/tutorial/README.txt', -- 'cherrypy/tutorial/pdf_file.pdf', -- 'cherrypy/tutorial/custom_error.html', -- ] -- ), - ('cherrypy', ['cherrypy/favicon.ico',]), -- ('cherrypy/test', ['cherrypy/test/style.css',]), -- ('cherrypy/test/static', ['cherrypy/test/static/index.html', -- 'cherrypy/test/static/has space.html', -- 'cherrypy/test/static/dirback.jpg',]), - ] - ############################################################################### - # end arguments for setup diff --git a/python-cherrypy2.spec b/python-cherrypy2.spec deleted file mode 100644 index 82143c7..0000000 --- a/python-cherrypy2.spec +++ /dev/null @@ -1,178 +0,0 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Name: python-cherrypy2 -Version: 2.3.0 -Release: 18%{?dist} -Summary: Pythonic, object-oriented web development framework -Group: Development/Libraries -License: BSD -URL: http://www.cherrypy.org/ -Source0: http://download.cherrypy.org/cherrypy/%{version}/CherryPy-%{version}.tar.gz -Source1: README.fedora -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: python-cherrypy-tutorial-doc.patch -Patch1: python-cherrypy-2.3.0-EINTR.patch -Patch2: python-cherrypy-2.3.0-py26-test.patch -Patch3: python-cherrypy-deprecation.patch -Patch4: python-cherrypy-2.3.0-broken_tests.patch -Patch5: python-cherrypy-2.3.0-py27_exceptions.patch -Patch6: python-cherrypy-2.3.0-EPIPE.patch - -BuildArch: noarch - -BuildRequires: python2-devel -BuildRequires: python-setuptools - -Requires: python-setuptools - -%description -CherryPy allows developers to build web applications in much the same way -they would build any other object-oriented Python program. This usually -results in smaller source code developed in less time. - -This is a compat package for programs which still need the 2.x branch of -CherryPy. - -%prep -%setup -q -n CherryPy-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -b .depr -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -b .epipe - -%{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt -cp -p %{SOURCE1} . - -%build -CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' bdist_egg - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{python_sitelib} -easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg -find $RPM_BUILD_ROOT%{python_sitelib}/ -type f -exec chmod -x \{\} \; - -%check -cd cherrypy/test -%{__python} test.py --dumb - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc CHANGELOG.txt CHERRYPYTEAM.txt README.txt README.fedora -%doc cherrypy/tutorial -%{python_sitelib}/* - -%changelog -* Thu Feb 14 2013 Fedora Release Engineering - 2.3.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Toshio Kuratomi - 2.3.0-17 -- Catch EPIPE's provoked by clients. (dcallagh) - https://bugzilla.redhat.com/show_bug.cgi?id=795984 - -* Sat Jan 14 2012 Fedora Release Engineering - 2.3.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2.3.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Aug 02 2010 Martin Bacovsky - 2.3.0-14 -- fixed hanging of test framework on failing tests (on python 2.7) - -* Fri Jul 30 2010 Martin Bacovsky - 2.3.0-13 -- fixed tests failing on python 2.7 - -* Wed Jul 21 2010 David Malcolm - 2.3.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri Dec 4 2009 Toshio Kuratomi - 2.3.0-11 -- Fix deprecation warnings. -- Change setuptools BuildRequirement as we're back to one package in F-13. - -* Wed Aug 12 2009 Toshio Kuratomi - 2.3.0-10 -- Remove the touch of easy_install.pth. It's not necessary and leads to file - conflicts with other packages. - -* Sun Jul 26 2009 Fedora Release Engineering - 2.3.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 2.3.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Dec 1 2008 Toshio Kuratomi 2.3.0-7 -- Build against the python-2.6 target - -* Mon Dec 1 2008 Toshio Kuratomi 2.3.0-6 -- Set tests to be non-interactive via the commandline instead of a patch. -- Patch to fix test errors with Python-2.6 - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.3.0-5 -- Rebuild for Python 2.6 - -* Sat Jun 14 2008 Toshio Kuratomi 2.3.0-4 -- Update README.fedora to fix some code examples and confusing wording. - -* Wed Jan 16 2008 Toshio Kuratomi 2.3.0-3 -- Merge changes from current python-cherrypy package. -- Update to 2.3.0. - -* Wed Jan 16 2008 Toshio Kuratomi 2.2.1-9 -- Initial cherrypy2 build. - -* Sun Jan 6 2008 Toshio Kuratomi 2.2.1-8 -- Fix a security bug with a backport of http://www.cherrypy.org/changeset/1775 -- Include the egginfo files as well as the python files. - -* Sat Nov 3 2007 Luke Macken 2.2.1-7 -- Apply backported fix from http://www.cherrypy.org/changeset/1766 - to improve CherryPy's SIGSTOP/SIGCONT handling (Bug #364911). - Thanks to Nils Philippsen for the patch. - -* Mon Feb 19 2007 Luke Macken 2.2.1-6 -- Disable regression tests until we can figure out why they - are dying in mock. - -* Sun Dec 10 2006 Luke Macken 2.2.1-5 -- Add python-devel to BuildRequires - -* Sun Dec 10 2006 Luke Macken 2.2.1-4 -- Rebuild for python 2.5 - -* Mon Sep 18 2006 Luke Macken 2.2.1-3 -- Rebuild for FC6 -- Include pyo files instead of ghosting them - -* Thu Jul 13 2006 Luke Macken 2.2.1-2 -- Rebuild - -* Thu Jul 13 2006 Luke Macken 2.2.1-1 -- Update to 2.2.1 -- Remove unnecessary python-abi requirement - -* Sat Apr 22 2006 Gijs Hollestelle 2.2.0-1 -- Update to 2.2.0 - -* Wed Feb 22 2006 Gijs Hollestelle 2.1.1-1 -- Update to 2.1.1 (Security fix) - -* Tue Nov 1 2005 Gijs Hollestelle 2.1.0-1 -- Updated to 2.1.0 - -* Sat May 14 2005 Gijs Hollestelle 2.0.0-2 -- Added dist tag - -* Sun May 8 2005 Gijs Hollestelle 2.0.0-1 -- Updated to 2.0.0 final -- Updated python-cherrypy-tutorial-doc.patch to match new version - -* Wed Apr 6 2005 Ignacio Vazquez-Abrams 2.0.0-0.2.b -- Removed CFLAGS - -* Wed Mar 23 2005 Gijs Hollestelle 2.0.0-0.1.b -- Initial Fedora Package diff --git a/sources b/sources deleted file mode 100644 index bfca383..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -80ce0f666f2899d4e681432e4061db16 CherryPy-2.3.0.tar.gz