CHANGES.txt | ●●●●● patch | view | raw | blame | history | |
LICENSE.txt | ●●●●● patch | view | raw | blame | history | |
pyramid/compat.py | ●●●●● patch | view | raw | blame | history | |
pyramid/compat/__init__.py | ●●●●● patch | view | raw | blame | history | |
pyramid/config.py | ●●●●● patch | view | raw | blame | history | |
pyramid/tests/test_compat.py | ●●●●● patch | view | raw | blame | history | |
pyramid/tests/test_config.py | ●●●●● patch | view | raw | blame | history | |
pyramid/urldispatch.py | ●●●●● patch | view | raw | blame | history | |
pyramid/wsgi.py | ●●●●● patch | view | raw | blame | history |
CHANGES.txt
@@ -1,6 +1,12 @@ Next release ============ Internals --------- - Remove ``compat`` code that served only the purpose of providing backwards compatibility with Python 2.4. Documentation ------------- LICENSE.txt
@@ -98,59 +98,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Portions of the code in Pyramid are supplied under the Python Software Foundation License version 2 (headers within individiual files indicate that these portions are so licensed): PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -------------------------------------------- 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python. 4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions. 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. 8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this License Agreement. The documentation portion of Pyramid (the rendered contents of the "docs" directory of a software distribution or checkout) is supplied under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 pyramid/compat.py
New file @@ -0,0 +1,8 @@ try: import json except ImportError: # pragma: no cover try: import simplejson as json except NotImplementedError: from django.utils import simplejson as json # GAE pyramid/compat/__init__.py
File was deleted pyramid/config.py
@@ -5,6 +5,7 @@ import types import traceback import warnings from hashlib import md5 import venusian @@ -52,9 +53,6 @@ from pyramid import renderers from pyramid.authorization import ACLAuthorizationPolicy from pyramid.compat import all from pyramid.compat import md5 from pyramid.compat import any from pyramid.events import ApplicationCreated from pyramid.exceptions import ConfigurationError from pyramid.exceptions import PredicateMismatch pyramid/tests/test_compat.py
File was deleted pyramid/tests/test_config.py
@@ -1017,7 +1017,7 @@ self.assertEqual(wrapper, view) def test_add_view_same_phash_overrides_existing_single_view(self): from pyramid.compat import md5 from hashlib import md5 from zope.interface import Interface from pyramid.interfaces import IRequest from pyramid.interfaces import IView @@ -1040,7 +1040,7 @@ self.assertEqual(wrapper(None, request), 'OK') def test_add_view_exc_same_phash_overrides_existing_single_view(self): from pyramid.compat import md5 from hashlib import md5 from zope.interface import implementedBy from pyramid.interfaces import IRequest from pyramid.interfaces import IView pyramid/urldispatch.py
@@ -5,7 +5,6 @@ from pyramid.interfaces import IRoutesMapper from pyramid.interfaces import IRoute from pyramid.compat import all from pyramid.encode import url_quote from pyramid.exceptions import URLDecodeError from pyramid.traversal import traversal_path pyramid/wsgi.py
@@ -1,4 +1,4 @@ from pyramid.compat import wraps from functools import wraps from pyramid.request import call_app_with_subpath_as_path_info def wsgiapp(wrapped):