-AUX cherrypy-2.2.1-invalidsession.patch 996 RMD160 bc5e1da37b025aff36e8a213eea3f6d16849fe15 SHA1 7d9b7746316366e6e22b5470c09092645acbe1a4 SHA256 cde3b679672b132d84d30736303f407d64b26db78054c8589e7544363d089801
-AUX cherrypy-2.2.1-py2.5.patch 6037 RMD160 c9497987c0c962cae6fd073f270f3f2d38f86f38 SHA1 fda2f4c68ef0a8ecd63e30034299ea6ce828577e SHA256 f0e3fdf2efbb5c5bd53c339787653942a50b89cb646bd22a88b56e3fa7de4e0a
-AUX cherrypy-3.0.2-invalidsession.patch 747 RMD160 92c088af4053b852a861109bbf7ac9e438573b0d SHA1 9a63febd16aaf72450be4ff85417d792400f5313 SHA256 cd9be33449056e8dd1bfdab67d1112d53fe237ef62392c2a11346956292328b0
-DIST CherryPy-2.2.1.tar.gz 219932 RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 SHA1 cda044ceed78059a56c54ce157bca564f4907a51 SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
DIST CherryPy-2.3.0.tar.gz 241999 RMD160 4c95735b17d58c431f1dbf685500d2a1ca8e38d8 SHA1 067121c5f31442519ac07138ffe8af6f7c7465d2 SHA256 a41e1b31ab723f50223b303991bb4e1a420a05deb2f4ab923a2ceadece4854cf
-DIST CherryPy-3.0.2.tar.gz 262428 RMD160 0bd98ca014b6539cd03969b6b3d85308d296b88e SHA1 8aae47ff892b42761c21ca552222f8f251dbc1b2 SHA256 cd590e57543bf1c590c006bfd7c222adce6ab1584ef35d72dd91558e4e281a1a
DIST CherryPy-3.1.2.tar.gz 319196 RMD160 43a34bc7454da21b597c60124ff0fc61b8dc3e31 SHA1 a94aedfd0e675858dbcc32dd250c23d285ee9b88 SHA256 0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6
-EBUILD cherrypy-2.2.1-r2.ebuild 1163 RMD160 3a116fe2e67880d4eb2e70d083987c17591ee7e6 SHA1 8f373a05e47135c65fca4a5c5105c51274adc946 SHA256 15cad80d35bc542258a6fd04d1f121cfd89896ce55272994a5c97e045ebabb39
EBUILD cherrypy-2.3.0.ebuild 1211 RMD160 d8957e58708486fffd4e22d9a61ec2f9d09eeeef SHA1 c17ab1ca60eaddbc642e9ebcfaf5efc0c9e8022a SHA256 64d47afda4b7f1d2df728eb6369cb722650c500781965841aef6adaa9f65b332
-EBUILD cherrypy-3.0.2-r1.ebuild 998 RMD160 78a941af3506f4abd8d0259991edc9291508ae0c SHA1 4a0e5d32a66f109a019d6866d2e1f716d5b77d61 SHA256 25f17acff3da5743b38dab9bf13d15a5513a1ae97b1625c26f19b465220f94d5
EBUILD cherrypy-3.1.2.ebuild 1010 RMD160 3485263778376d766447efc975b6cc9ae590c8a4 SHA1 b5bc2fb9c717f23c60525147c089e9d92d3ed54d SHA256 345d7acf26f98b4d284270ecb3e1e2b8ce0c9b8ca2158f9f154b56b8e991e42c
MISC ChangeLog 6572 RMD160 c3c506ab93d0cfa68d96c0ae0e9663b15219129a SHA1 d92f5728f754d43a580a707325d446daf09df6ea SHA256 cd62c482211a160d12500971be32c9c6d277a309f321a52a3f1b92446b1a914a
MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+++ /dev/null
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.2.1-r2.ebuild,v 1.2 2008/01/09 14:55:42 armin76 Exp $
-
-inherit eutils distutils
-
-MY_P=CherryPy-${PV}
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
-SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.cherrypy.org/"
-IUSE="doc"
-SLOT="0"
-KEYWORDS="~amd64 ia64 ~ppc x86"
-LICENSE="BSD"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-py2.5.patch
- epatch "${FILESDIR}"/${P}-invalidsession.patch
- sed -i \
- -e '/raw_input/d' \
- cherrypy/test/test.py || die "sed failed"
- sed -i \
- -e 's/"cherrypy.tutorial",//' \
- -e "/('cherrypy\/tutorial',/, /),/d" \
- -e 's/distutils.core/setuptools/' \
- setup.py || die "sed failed"
-
-}
-
-src_install() {
- distutils_src_install
- if use doc ; then
- insinto /usr/share/doc/${PF}
- doins -r cherrypy/tutorial
- fi
-}
-
-src_test() {
- PYTHONPATH=. "${python}" cherrypy/test/test.py || die "test failed"
-}
+++ /dev/null
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.0.2-r1.ebuild,v 1.2 2008/01/08 17:16:21 armin76 Exp $
-
-inherit eutils distutils
-
-MY_P=CherryPy-${PV}
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
-SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.cherrypy.org/"
-IUSE="doc"
-SLOT="0"
-KEYWORDS="~amd64 ia64 ~ppc x86"
-LICENSE="BSD"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-invalidsession.patch
- sed -i \
- -e 's/"cherrypy.tutorial",//' \
- -e "/('cherrypy\/tutorial',/, /),/d" \
- setup.py || die "sed failed"
-
-}
-
-src_install() {
- distutils_src_install
- if use doc ; then
- insinto /usr/share/doc/${PF}
- doins -r cherrypy/tutorial
- fi
-}
-
-src_test() {
- PYTHONPATH=. "${python}" cherrypy/test/test.py --dumb || die "test failed"
-}
+++ /dev/null
---- cherrypy/filters/sessionfilter.py 2006-04-25 04:37:45.000000000 +0300
-+++ cherrypy/filters/sessionfilter.py 2008-01-08 23:01:09.000000000 +0200
-@@ -326,6 +326,8 @@
- raise SessionStoragePathNotConfiguredError()
- fileName = self.SESSION_PREFIX + id
- file_path = os.path.join(storage_path, fileName)
-+ if not os.path.normpath(file_path).startswith(storage_path):
-+ raise cherrypy.HTTPError(400, "Invalid session id in cookie.")
- return file_path
-
- def _lock_file(self, path):
---- cherrypy/test/test_session_filter.py 2006-04-25 04:37:40.000000000 +0300
-+++ cherrypy/test/test_session_filter.py 2008-01-08 23:00:39.000000000 +0200
-@@ -28,7 +28,7 @@
- 'server.environment': 'production',
- 'session_filter.on': True,
- 'session_filter.storage_type' : 'file',
-- 'session_filter.storage_path' : '.',
-+ 'session_filter.storage_path' : os.path.abspath('.'),
- })
-
- import helper
+++ /dev/null
-diff -ur CherryPy-2.2.1/cherrypy/test/test_core.py CherryPy-2.2.1-py2.5/cherrypy/test/test_core.py
---- CherryPy-2.2.1/cherrypy/test/test_core.py 2006-04-25 04:37:40.000000000 +0300
-+++ CherryPy-2.2.1-py2.5/cherrypy/test/test_core.py 2008-01-08 23:37:55.000000000 +0200
-@@ -824,15 +824,27 @@
- self.assertBody(data)
-
- def testCookies(self):
-- self.getPage("/cookies/single?name=First",
-+ import sys
-+ if sys.version_info >= (2, 5):
-+ self.getPage("/cookies/single?name=First",
-+ [('Cookie', 'First=Dinsdale;')])
-+ self.assertHeader('Set-Cookie', 'First=Dinsdale')
-+
-+ self.getPage("/cookies/multiple?names=First&names=Last",
-+ [('Cookie', 'First=Dinsdale; Last=Piranha;'),
-+ ])
-+ self.assertHeader('Set-Cookie', 'First=Dinsdale')
-+ self.assertHeader('Set-Cookie', 'Last=Piranha')
-+ else:
-+ self.getPage("/cookies/single?name=First",
- [('Cookie', 'First=Dinsdale;')])
-- self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-+ self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-
-- self.getPage("/cookies/multiple?names=First&names=Last",
-+ self.getPage("/cookies/multiple?names=First&names=Last",
- [('Cookie', 'First=Dinsdale; Last=Piranha;'),
- ])
-- self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-- self.assertHeader('Set-Cookie', 'Last=Piranha;')
-+ self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-+ self.assertHeader('Set-Cookie', 'Last=Piranha;')
-
- def testMaxRequestSize(self):
- self.getPage("/", headers=[('From', "x" * 500)])
-diff -ur CherryPy-2.2.1/cherrypy/test/webtest.py CherryPy-2.2.1-py2.5/cherrypy/test/webtest.py
---- CherryPy-2.2.1/cherrypy/test/webtest.py 2006-04-25 04:37:40.000000000 +0300
-+++ CherryPy-2.2.1-py2.5/cherrypy/test/webtest.py 2008-01-08 23:58:51.000000000 +0200
-@@ -204,43 +204,81 @@
- def exit(self):
- sys.exit()
-
-- def __call__(self, result=None):
-- if result is None:
-- result = self.defaultTestResult()
-- result.startTest(self)
-- testMethod = getattr(self, self._TestCase__testMethodName)
-- try:
-- try:
-- self.setUp()
-- except (KeyboardInterrupt, SystemExit):
-- raise
-- except:
-- result.addError(self, self._TestCase__exc_info())
-- return
--
-- ok = 0
-+ if sys.version_info >= (2, 5):
-+ def __call__(self, result=None):
-+ if result is None:
-+ result = self.defaultTestResult()
-+ result.startTest(self)
-+ testMethod = getattr(self, self._testMethodName)
- try:
-- testMethod()
-- ok = 1
-- except self.failureException:
-- result.addFailure(self, self._TestCase__exc_info())
-- except (KeyboardInterrupt, SystemExit):
-- raise
-- except:
-- result.addError(self, self._TestCase__exc_info())
--
-+ try:
-+ self.setUp()
-+ except (KeyboardInterrupt, SystemExit):
-+ raise
-+ except:
-+ result.addError(self, self._exc_info())
-+ return
-+
-+ ok = 0
-+ try:
-+ testMethod()
-+ ok = 1
-+ except self.failureException:
-+ result.addFailure(self, self._exc_info())
-+ except (KeyboardInterrupt, SystemExit):
-+ raise
-+ except:
-+ result.addError(self, self._exc_info())
-+
-+ try:
-+ self.tearDown()
-+ except (KeyboardInterrupt, SystemExit):
-+ raise
-+ except:
-+ result.addError(self, self._exc_info())
-+ ok = 0
-+ if ok:
-+ result.addSuccess(self)
-+ finally:
-+ result.stopTest(self)
-+ else:
-+ def __call__(self, result=None):
-+ if result is None:
-+ result = self.defaultTestResult()
-+ result.startTest(self)
-+ testMethod = getattr(self, self._TestCase__testMethodName)
- try:
-- self.tearDown()
-- except (KeyboardInterrupt, SystemExit):
-- raise
-- except:
-- result.addError(self, self._TestCase__exc_info())
-+ try:
-+ self.setUp()
-+ except (KeyboardInterrupt, SystemExit):
-+ raise
-+ except:
-+ result.addError(self, self._TestCase__exc_info())
-+ return
-+
- ok = 0
-- if ok:
-- result.addSuccess(self)
-- finally:
-- result.stopTest(self)
--
-+ try:
-+ testMethod()
-+ ok = 1
-+ except self.failureException:
-+ result.addFailure(self, self._TestCase__exc_info())
-+ except (KeyboardInterrupt, SystemExit):
-+ raise
-+ except:
-+ result.addError(self, self._TestCase__exc_info())
-+
-+ try:
-+ self.tearDown()
-+ except (KeyboardInterrupt, SystemExit):
-+ raise
-+ except:
-+ result.addError(self, self._TestCase__exc_info())
-+ ok = 0
-+ if ok:
-+ result.addSuccess(self)
-+ finally:
-+ result.stopTest(self)
-+
- def assertStatus(self, status, msg=None):
- """Fail if self.status != status."""
- if isinstance(status, basestring):
projects / gentoo.git / commitdiff