From 24b1c8b3b1d58597765f94a037524f1b29f1c976 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 1 Sep 2011 01:32:27 -0400 Subject: move fixture packages into pkgs subdir of tests --- pyramid/tests/ccbugapp/__init__.py | 16 --------- pyramid/tests/conflictapp/__init__.py | 23 ------------ pyramid/tests/conflictapp/included.py | 6 ---- pyramid/tests/defpermbugapp/__init__.py | 26 -------------- pyramid/tests/exceptionviewapp/__init__.py | 23 ------------ pyramid/tests/exceptionviewapp/models.py | 18 ---------- pyramid/tests/exceptionviewapp/views.py | 17 --------- pyramid/tests/fixtureapp/__init__.py | 12 ------- pyramid/tests/fixtureapp/models.py | 8 ----- pyramid/tests/fixtureapp/subpackage/__init__.py | 1 - .../tests/fixtureapp/subpackage/templates/bar.pt | 2 -- pyramid/tests/fixtureapp/templates/fixture.pt | 6 ---- pyramid/tests/fixtureapp/views.py | 22 ------------ pyramid/tests/forbiddenapp/__init__.py | 23 ------------ pyramid/tests/hybridapp/__init__.py | 39 --------------------- pyramid/tests/hybridapp/views.py | 39 --------------------- pyramid/tests/includeapp1/__init__.py | 1 - pyramid/tests/includeapp1/root.py | 10 ------ pyramid/tests/includeapp1/three.py | 10 ------ pyramid/tests/includeapp1/two.py | 9 ----- pyramid/tests/localeapp/__init__.py | 1 - pyramid/tests/localeapp/locale/GARBAGE | 1 - pyramid/tests/localeapp/locale/be/LC_MESSAGES | 1 - .../localeapp/locale/de/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../localeapp/locale/de/LC_MESSAGES/deformsite.po | 31 ---------------- .../localeapp/locale/en/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../localeapp/locale/en/LC_MESSAGES/deformsite.po | 31 ---------------- pyramid/tests/localeapp/locale2/GARBAGE | 1 - pyramid/tests/localeapp/locale2/be/LC_MESSAGES | 1 - .../localeapp/locale2/de/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../localeapp/locale2/de/LC_MESSAGES/deformsite.po | 31 ---------------- .../localeapp/locale2/en/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../localeapp/locale2/en/LC_MESSAGES/deformsite.po | 31 ---------------- pyramid/tests/localeapp/locale3/GARBAGE | 1 - pyramid/tests/localeapp/locale3/be/LC_MESSAGES | 1 - .../localeapp/locale3/de/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../localeapp/locale3/de/LC_MESSAGES/deformsite.po | 31 ---------------- .../localeapp/locale3/en/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../localeapp/locale3/en/LC_MESSAGES/deformsite.po | 31 ---------------- pyramid/tests/permbugapp/__init__.py | 22 ------------ pyramid/tests/pkgs/__init__.py | 1 + pyramid/tests/pkgs/ccbugapp/__init__.py | 16 +++++++++ pyramid/tests/pkgs/conflictapp/__init__.py | 23 ++++++++++++ pyramid/tests/pkgs/conflictapp/included.py | 6 ++++ pyramid/tests/pkgs/defpermbugapp/__init__.py | 26 ++++++++++++++ pyramid/tests/pkgs/exceptionviewapp/__init__.py | 23 ++++++++++++ pyramid/tests/pkgs/exceptionviewapp/models.py | 18 ++++++++++ pyramid/tests/pkgs/exceptionviewapp/views.py | 17 +++++++++ pyramid/tests/pkgs/fixtureapp/__init__.py | 12 +++++++ pyramid/tests/pkgs/fixtureapp/models.py | 8 +++++ .../tests/pkgs/fixtureapp/subpackage/__init__.py | 1 + .../pkgs/fixtureapp/subpackage/templates/bar.pt | 2 ++ pyramid/tests/pkgs/fixtureapp/templates/fixture.pt | 6 ++++ pyramid/tests/pkgs/fixtureapp/views.py | 22 ++++++++++++ pyramid/tests/pkgs/forbiddenapp/__init__.py | 23 ++++++++++++ pyramid/tests/pkgs/hybridapp/__init__.py | 39 +++++++++++++++++++++ pyramid/tests/pkgs/hybridapp/views.py | 39 +++++++++++++++++++++ pyramid/tests/pkgs/includeapp1/__init__.py | 1 + pyramid/tests/pkgs/includeapp1/root.py | 10 ++++++ pyramid/tests/pkgs/includeapp1/three.py | 10 ++++++ pyramid/tests/pkgs/includeapp1/two.py | 9 +++++ pyramid/tests/pkgs/localeapp/__init__.py | 1 + pyramid/tests/pkgs/localeapp/locale/GARBAGE | 1 + pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES | 1 + .../localeapp/locale/de/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale/de/LC_MESSAGES/deformsite.po | 31 ++++++++++++++++ .../localeapp/locale/en/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale/en/LC_MESSAGES/deformsite.po | 31 ++++++++++++++++ pyramid/tests/pkgs/localeapp/locale2/GARBAGE | 1 + .../tests/pkgs/localeapp/locale2/be/LC_MESSAGES | 1 + .../localeapp/locale2/de/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale2/de/LC_MESSAGES/deformsite.po | 31 ++++++++++++++++ .../localeapp/locale2/en/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale2/en/LC_MESSAGES/deformsite.po | 31 ++++++++++++++++ pyramid/tests/pkgs/localeapp/locale3/GARBAGE | 1 + .../tests/pkgs/localeapp/locale3/be/LC_MESSAGES | 1 + .../localeapp/locale3/de/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale3/de/LC_MESSAGES/deformsite.po | 31 ++++++++++++++++ .../localeapp/locale3/en/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale3/en/LC_MESSAGES/deformsite.po | 31 ++++++++++++++++ pyramid/tests/pkgs/permbugapp/__init__.py | 22 ++++++++++++ pyramid/tests/pkgs/rendererscanapp/__init__.py | 9 +++++ pyramid/tests/pkgs/rendererscanapp/one.pt | 4 +++ pyramid/tests/pkgs/rendererscanapp/two/__init__.py | 6 ++++ pyramid/tests/pkgs/rendererscanapp/two/two.pt | 4 +++ pyramid/tests/pkgs/restbugapp/__init__.py | 15 ++++++++ pyramid/tests/pkgs/restbugapp/views.py | 15 ++++++++ pyramid/tests/pkgs/staticpermapp/__init__.py | 25 +++++++++++++ pyramid/tests/pkgs/viewdecoratorapp/__init__.py | 3 ++ .../tests/pkgs/viewdecoratorapp/views/__init__.py | 1 + .../pkgs/viewdecoratorapp/views/templates/foo.mak | 3 ++ pyramid/tests/pkgs/viewdecoratorapp/views/views.py | 12 +++++++ pyramid/tests/pkgs/wsgiapp2app/__init__.py | 17 +++++++++ pyramid/tests/rendererscanapp/__init__.py | 9 ----- pyramid/tests/rendererscanapp/one.pt | 4 --- pyramid/tests/rendererscanapp/two/__init__.py | 6 ---- pyramid/tests/rendererscanapp/two/two.pt | 4 --- pyramid/tests/restbugapp/__init__.py | 15 -------- pyramid/tests/restbugapp/views.py | 15 -------- pyramid/tests/staticpermapp/__init__.py | 25 ------------- pyramid/tests/test_config/test_i18n.py | 22 ++++++------ pyramid/tests/test_config/test_views.py | 1 - pyramid/tests/test_i18n.py | 34 +++--------------- pyramid/tests/test_integration.py | 39 +++++++++++---------- pyramid/tests/viewdecoratorapp/__init__.py | 3 -- pyramid/tests/viewdecoratorapp/views/__init__.py | 1 - .../tests/viewdecoratorapp/views/templates/foo.mak | 3 -- pyramid/tests/viewdecoratorapp/views/views.py | 11 ------ pyramid/tests/wsgiapp2app/__init__.py | 17 --------- 109 files changed, 677 insertions(+), 699 deletions(-) delete mode 100644 pyramid/tests/ccbugapp/__init__.py delete mode 100644 pyramid/tests/conflictapp/__init__.py delete mode 100644 pyramid/tests/conflictapp/included.py delete mode 100644 pyramid/tests/defpermbugapp/__init__.py delete mode 100644 pyramid/tests/exceptionviewapp/__init__.py delete mode 100644 pyramid/tests/exceptionviewapp/models.py delete mode 100644 pyramid/tests/exceptionviewapp/views.py delete mode 100644 pyramid/tests/fixtureapp/__init__.py delete mode 100644 pyramid/tests/fixtureapp/models.py delete mode 100644 pyramid/tests/fixtureapp/subpackage/__init__.py delete mode 100644 pyramid/tests/fixtureapp/subpackage/templates/bar.pt delete mode 100644 pyramid/tests/fixtureapp/templates/fixture.pt delete mode 100644 pyramid/tests/fixtureapp/views.py delete mode 100644 pyramid/tests/forbiddenapp/__init__.py delete mode 100644 pyramid/tests/hybridapp/__init__.py delete mode 100644 pyramid/tests/hybridapp/views.py delete mode 100644 pyramid/tests/includeapp1/__init__.py delete mode 100644 pyramid/tests/includeapp1/root.py delete mode 100644 pyramid/tests/includeapp1/three.py delete mode 100644 pyramid/tests/includeapp1/two.py delete mode 100644 pyramid/tests/localeapp/__init__.py delete mode 100644 pyramid/tests/localeapp/locale/GARBAGE delete mode 100644 pyramid/tests/localeapp/locale/be/LC_MESSAGES delete mode 100644 pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo delete mode 100644 pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po delete mode 100644 pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo delete mode 100644 pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po delete mode 100644 pyramid/tests/localeapp/locale2/GARBAGE delete mode 100644 pyramid/tests/localeapp/locale2/be/LC_MESSAGES delete mode 100644 pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.mo delete mode 100644 pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.po delete mode 100644 pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.mo delete mode 100644 pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.po delete mode 100644 pyramid/tests/localeapp/locale3/GARBAGE delete mode 100644 pyramid/tests/localeapp/locale3/be/LC_MESSAGES delete mode 100644 pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.mo delete mode 100644 pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.po delete mode 100644 pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.mo delete mode 100644 pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.po delete mode 100644 pyramid/tests/permbugapp/__init__.py create mode 100644 pyramid/tests/pkgs/__init__.py create mode 100644 pyramid/tests/pkgs/ccbugapp/__init__.py create mode 100644 pyramid/tests/pkgs/conflictapp/__init__.py create mode 100644 pyramid/tests/pkgs/conflictapp/included.py create mode 100644 pyramid/tests/pkgs/defpermbugapp/__init__.py create mode 100644 pyramid/tests/pkgs/exceptionviewapp/__init__.py create mode 100644 pyramid/tests/pkgs/exceptionviewapp/models.py create mode 100644 pyramid/tests/pkgs/exceptionviewapp/views.py create mode 100644 pyramid/tests/pkgs/fixtureapp/__init__.py create mode 100644 pyramid/tests/pkgs/fixtureapp/models.py create mode 100644 pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py create mode 100644 pyramid/tests/pkgs/fixtureapp/subpackage/templates/bar.pt create mode 100644 pyramid/tests/pkgs/fixtureapp/templates/fixture.pt create mode 100644 pyramid/tests/pkgs/fixtureapp/views.py create mode 100644 pyramid/tests/pkgs/forbiddenapp/__init__.py create mode 100644 pyramid/tests/pkgs/hybridapp/__init__.py create mode 100644 pyramid/tests/pkgs/hybridapp/views.py create mode 100644 pyramid/tests/pkgs/includeapp1/__init__.py create mode 100644 pyramid/tests/pkgs/includeapp1/root.py create mode 100644 pyramid/tests/pkgs/includeapp1/three.py create mode 100644 pyramid/tests/pkgs/includeapp1/two.py create mode 100644 pyramid/tests/pkgs/localeapp/__init__.py create mode 100644 pyramid/tests/pkgs/localeapp/locale/GARBAGE create mode 100644 pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES create mode 100644 pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo create mode 100644 pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po create mode 100644 pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo create mode 100644 pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po create mode 100644 pyramid/tests/pkgs/localeapp/locale2/GARBAGE create mode 100644 pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES create mode 100644 pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo create mode 100644 pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po create mode 100644 pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo create mode 100644 pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po create mode 100644 pyramid/tests/pkgs/localeapp/locale3/GARBAGE create mode 100644 pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES create mode 100644 pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo create mode 100644 pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po create mode 100644 pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo create mode 100644 pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po create mode 100644 pyramid/tests/pkgs/permbugapp/__init__.py create mode 100644 pyramid/tests/pkgs/rendererscanapp/__init__.py create mode 100644 pyramid/tests/pkgs/rendererscanapp/one.pt create mode 100644 pyramid/tests/pkgs/rendererscanapp/two/__init__.py create mode 100644 pyramid/tests/pkgs/rendererscanapp/two/two.pt create mode 100644 pyramid/tests/pkgs/restbugapp/__init__.py create mode 100644 pyramid/tests/pkgs/restbugapp/views.py create mode 100644 pyramid/tests/pkgs/staticpermapp/__init__.py create mode 100644 pyramid/tests/pkgs/viewdecoratorapp/__init__.py create mode 100644 pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py create mode 100644 pyramid/tests/pkgs/viewdecoratorapp/views/templates/foo.mak create mode 100644 pyramid/tests/pkgs/viewdecoratorapp/views/views.py create mode 100644 pyramid/tests/pkgs/wsgiapp2app/__init__.py delete mode 100644 pyramid/tests/rendererscanapp/__init__.py delete mode 100644 pyramid/tests/rendererscanapp/one.pt delete mode 100644 pyramid/tests/rendererscanapp/two/__init__.py delete mode 100644 pyramid/tests/rendererscanapp/two/two.pt delete mode 100644 pyramid/tests/restbugapp/__init__.py delete mode 100644 pyramid/tests/restbugapp/views.py delete mode 100644 pyramid/tests/staticpermapp/__init__.py delete mode 100644 pyramid/tests/viewdecoratorapp/__init__.py delete mode 100644 pyramid/tests/viewdecoratorapp/views/__init__.py delete mode 100644 pyramid/tests/viewdecoratorapp/views/templates/foo.mak delete mode 100644 pyramid/tests/viewdecoratorapp/views/views.py delete mode 100644 pyramid/tests/wsgiapp2app/__init__.py diff --git a/pyramid/tests/ccbugapp/__init__.py b/pyramid/tests/ccbugapp/__init__.py deleted file mode 100644 index afe21d4e0..000000000 --- a/pyramid/tests/ccbugapp/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -from webob import Response - -def rdf_view(request): - """ """ - return Response('rdf') - -def juri_view(request): - """ """ - return Response('juri') - -def includeme(config): - config.add_route('rdf', 'licenses/:license_code/:license_version/rdf') - config.add_route('juri', - 'licenses/:license_code/:license_version/:jurisdiction') - config.add_view(rdf_view, route_name='rdf') - config.add_view(juri_view, route_name='juri') diff --git a/pyramid/tests/conflictapp/__init__.py b/pyramid/tests/conflictapp/__init__.py deleted file mode 100644 index 429237973..000000000 --- a/pyramid/tests/conflictapp/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -from pyramid.response import Response -from pyramid.authentication import AuthTktAuthenticationPolicy -from pyramid.authorization import ACLAuthorizationPolicy - -def aview(request): - return Response('a view') - -def routeview(request): - return Response('route view') - -def protectedview(request): - return Response('protected view') - -def includeme(config): - # purposely sorta-randomly ordered (route comes after view naming it, - # authz comes after views) - config.add_view(aview) - config.add_view(protectedview, name='protected', permission='view') - config.add_view(routeview, route_name='aroute') - config.add_route('aroute', '/route') - config.set_authentication_policy(AuthTktAuthenticationPolicy('seekri1t')) - config.set_authorization_policy(ACLAuthorizationPolicy()) - config.include('pyramid.tests.conflictapp.included') diff --git a/pyramid/tests/conflictapp/included.py b/pyramid/tests/conflictapp/included.py deleted file mode 100644 index 0b76fb2bc..000000000 --- a/pyramid/tests/conflictapp/included.py +++ /dev/null @@ -1,6 +0,0 @@ -from webob import Response - -def bview(request): return Response('b view') - -def includeme(config): - config.add_view(bview) diff --git a/pyramid/tests/defpermbugapp/__init__.py b/pyramid/tests/defpermbugapp/__init__.py deleted file mode 100644 index 49602749c..000000000 --- a/pyramid/tests/defpermbugapp/__init__.py +++ /dev/null @@ -1,26 +0,0 @@ -from webob import Response -from pyramid.security import NO_PERMISSION_REQUIRED -from pyramid.view import view_config - -@view_config(name='x') -def x_view(request): # pragma: no cover - return Response('this is private!') - -@view_config(name='y', permission='private2') -def y_view(request): # pragma: no cover - return Response('this is private too!') - -@view_config(name='z', permission=NO_PERMISSION_REQUIRED) -def z_view(request): - return Response('this is public') - -def includeme(config): - from pyramid.authorization import ACLAuthorizationPolicy - from pyramid.authentication import AuthTktAuthenticationPolicy - authn_policy = AuthTktAuthenticationPolicy('seekt1t') - authz_policy = ACLAuthorizationPolicy() - config.scan('pyramid.tests.defpermbugapp') - config._set_authentication_policy(authn_policy) - config._set_authorization_policy(authz_policy) - config.set_default_permission('private') - diff --git a/pyramid/tests/exceptionviewapp/__init__.py b/pyramid/tests/exceptionviewapp/__init__.py deleted file mode 100644 index f169e0cd5..000000000 --- a/pyramid/tests/exceptionviewapp/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -def includeme(config): - config.add_route('route_raise_exception', 'route_raise_exception') - config.add_route('route_raise_exception2', 'route_raise_exception2', - factory='.models.route_factory') - config.add_route('route_raise_exception3', 'route_raise_exception3', - factory='.models.route_factory2') - config.add_route('route_raise_exception4', 'route_raise_exception4') - config.add_view('.views.maybe') - config.add_view('.views.no', context='.models.NotAnException') - config.add_view('.views.yes', context=".models.AnException") - config.add_view('.views.raise_exception', name='raise_exception') - config.add_view('.views.raise_exception', - route_name='route_raise_exception') - config.add_view('.views.raise_exception', - route_name='route_raise_exception2') - config.add_view('.views.raise_exception', - route_name='route_raise_exception3') - config.add_view('.views.whoa', context='.models.AnException', - route_name='route_raise_exception3') - config.add_view('.views.raise_exception', - route_name='route_raise_exception4') - config.add_view('.views.whoa', context='.models.AnException', - route_name='route_raise_exception4') diff --git a/pyramid/tests/exceptionviewapp/models.py b/pyramid/tests/exceptionviewapp/models.py deleted file mode 100644 index fe407badc..000000000 --- a/pyramid/tests/exceptionviewapp/models.py +++ /dev/null @@ -1,18 +0,0 @@ - -class NotAnException(object): - pass - -class AnException(Exception): - pass - -class RouteContext(object): - pass - -class RouteContext2(object): - pass - -def route_factory(*arg): - return RouteContext() - -def route_factory2(*arg): - return RouteContext2() diff --git a/pyramid/tests/exceptionviewapp/views.py b/pyramid/tests/exceptionviewapp/views.py deleted file mode 100644 index 1432618cf..000000000 --- a/pyramid/tests/exceptionviewapp/views.py +++ /dev/null @@ -1,17 +0,0 @@ -from webob import Response -from models import AnException - -def no(request): - return Response('no') - -def yes(request): - return Response('yes') - -def maybe(request): - return Response('maybe') - -def whoa(request): - return Response('whoa') - -def raise_exception(request): - raise AnException() diff --git a/pyramid/tests/fixtureapp/__init__.py b/pyramid/tests/fixtureapp/__init__.py deleted file mode 100644 index c74747bfd..000000000 --- a/pyramid/tests/fixtureapp/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -def includeme(config): - config.add_view('.views.fixture_view') - config.add_view('.views.exception_view', context=RuntimeError) - config.add_view('.views.protected_view', name='protected.html') - config.add_view('.views.erroneous_view', name='error.html') - config.add_view('.views.fixture_view', name='dummyskin.html', - request_type='.views.IDummy') - from models import fixture, IFixture - config.registry.registerUtility(fixture, IFixture) - config.add_view('.views.fixture_view', name='another.html') - - diff --git a/pyramid/tests/fixtureapp/models.py b/pyramid/tests/fixtureapp/models.py deleted file mode 100644 index d80d14bb3..000000000 --- a/pyramid/tests/fixtureapp/models.py +++ /dev/null @@ -1,8 +0,0 @@ -from zope.interface import Interface - -class IFixture(Interface): - pass - -def fixture(): - """ """ - diff --git a/pyramid/tests/fixtureapp/subpackage/__init__.py b/pyramid/tests/fixtureapp/subpackage/__init__.py deleted file mode 100644 index d3173e636..000000000 --- a/pyramid/tests/fixtureapp/subpackage/__init__.py +++ /dev/null @@ -1 +0,0 @@ -#package diff --git a/pyramid/tests/fixtureapp/subpackage/templates/bar.pt b/pyramid/tests/fixtureapp/subpackage/templates/bar.pt deleted file mode 100644 index 90531a4b3..000000000 --- a/pyramid/tests/fixtureapp/subpackage/templates/bar.pt +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/pyramid/tests/fixtureapp/templates/fixture.pt b/pyramid/tests/fixtureapp/templates/fixture.pt deleted file mode 100644 index 06dd4e2b1..000000000 --- a/pyramid/tests/fixtureapp/templates/fixture.pt +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/pyramid/tests/fixtureapp/views.py b/pyramid/tests/fixtureapp/views.py deleted file mode 100644 index cbfc5a574..000000000 --- a/pyramid/tests/fixtureapp/views.py +++ /dev/null @@ -1,22 +0,0 @@ -from zope.interface import Interface -from webob import Response -from pyramid.httpexceptions import HTTPForbidden - -def fixture_view(context, request): - """ """ - return Response('fixture') - -def erroneous_view(context, request): - """ """ - raise RuntimeError() - -def exception_view(context, request): - """ """ - return Response('supressed') - -def protected_view(context, request): - """ """ - raise HTTPForbidden() - -class IDummy(Interface): - pass diff --git a/pyramid/tests/forbiddenapp/__init__.py b/pyramid/tests/forbiddenapp/__init__.py deleted file mode 100644 index 7001b87f5..000000000 --- a/pyramid/tests/forbiddenapp/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -from webob import Response -from pyramid.httpexceptions import HTTPForbidden - -def x_view(request): # pragma: no cover - return Response('this is private!') - -def forbidden_view(context, request): - msg = context.message - result = context.result - message = msg + '\n' + str(result) - resp = HTTPForbidden() - resp.body = message - return resp - -def includeme(config): - from pyramid.authentication import AuthTktAuthenticationPolicy - from pyramid.authorization import ACLAuthorizationPolicy - authn_policy = AuthTktAuthenticationPolicy('seekr1t') - authz_policy = ACLAuthorizationPolicy() - config._set_authentication_policy(authn_policy) - config._set_authorization_policy(authz_policy) - config.add_view(x_view, name='x', permission='private') - config.add_view(forbidden_view, context=HTTPForbidden) diff --git a/pyramid/tests/hybridapp/__init__.py b/pyramid/tests/hybridapp/__init__.py deleted file mode 100644 index 1cc2dde83..000000000 --- a/pyramid/tests/hybridapp/__init__.py +++ /dev/null @@ -1,39 +0,0 @@ -def includeme(config): - # - config.add_route('route', 'abc') - config.add_view('.views.route_view', route_name='route') - # - config.add_view('.views.global_view', - context='pyramid.traversal.DefaultRootFactory') - config.add_view('.views.global2_view', - context='pyramid.traversal.DefaultRootFactory', - name='global2') - config.add_route('route2', 'def') - # - config.add_view('.views.route2_view', route_name='route2') - - # - config.add_route('route3', 'ghi', use_global_views=True) - # - config.add_route('route4', 'jkl') - # - config.add_route('route5', 'mno/*traverse') - # - config.add_route('route6', 'pqr/*traverse', use_global_views=True) - config.add_route('route7', 'error') - config.add_view('.views.erroneous_view', route_name='route7') - config.add_route('route8', 'error2') - config.add_view('.views.erroneous_view', route_name='route8') - # - config.add_view('.views.exception_view', context=RuntimeError) - # - config.add_view('.views.exception2_view', context=RuntimeError, - route_name='route8') - config.add_route('route9', 'error_sub') - config.add_view('.views.erroneous_sub_view', route_name='route9') - # - config.add_view('.views.exception2_view', context='.views.SuperException', - route_name='route9') - # - config.add_view('.views.exception_view', context='.views.SubException') diff --git a/pyramid/tests/hybridapp/views.py b/pyramid/tests/hybridapp/views.py deleted file mode 100644 index 135ef8290..000000000 --- a/pyramid/tests/hybridapp/views.py +++ /dev/null @@ -1,39 +0,0 @@ -from webob import Response - -def route_view(request): - """ """ - return Response('route') - -def global_view(request): - """ """ - return Response('global') - -def global2_view(request): - """ """ - return Response('global2') - -def route2_view(request): - """ """ - return Response('route2') - -def exception_view(request): - """ """ - return Response('supressed') - -def exception2_view(request): - """ """ - return Response('supressed2') - -def erroneous_view(request): - """ """ - raise RuntimeError() - -def erroneous_sub_view(request): - """ """ - raise SubException() - -class SuperException(Exception): - """ """ - -class SubException(SuperException): - """ """ diff --git a/pyramid/tests/includeapp1/__init__.py b/pyramid/tests/includeapp1/__init__.py deleted file mode 100644 index eaeeb7ef6..000000000 --- a/pyramid/tests/includeapp1/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# include app diff --git a/pyramid/tests/includeapp1/root.py b/pyramid/tests/includeapp1/root.py deleted file mode 100644 index 3b042c8c2..000000000 --- a/pyramid/tests/includeapp1/root.py +++ /dev/null @@ -1,10 +0,0 @@ -from pyramid.response import Response - -def aview(request): - return Response('root') - -def configure(config): - config.add_view(aview) - config.include('pyramid.tests.includeapp1.two.configure') - config.commit() - diff --git a/pyramid/tests/includeapp1/three.py b/pyramid/tests/includeapp1/three.py deleted file mode 100644 index de7268bb6..000000000 --- a/pyramid/tests/includeapp1/three.py +++ /dev/null @@ -1,10 +0,0 @@ -from pyramid.response import Response - -def aview(request): - return Response('three') - -def configure(config): - config.add_view(aview, name='three') - config.include('pyramid.tests.includeapp1.two.configure') # should not cycle - config.add_view(aview) # will be overridden by root when resolved - diff --git a/pyramid/tests/includeapp1/two.py b/pyramid/tests/includeapp1/two.py deleted file mode 100644 index 960d77e3d..000000000 --- a/pyramid/tests/includeapp1/two.py +++ /dev/null @@ -1,9 +0,0 @@ -from pyramid.response import Response - -def aview(request): - return Response('two') - -def configure(config): - config.add_view(aview, name='two') - config.include('pyramid.tests.includeapp1.three.configure') - config.add_view(aview) # will be overridden by root when resolved diff --git a/pyramid/tests/localeapp/__init__.py b/pyramid/tests/localeapp/__init__.py deleted file mode 100644 index 1a35cdb4a..000000000 --- a/pyramid/tests/localeapp/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# a file diff --git a/pyramid/tests/localeapp/locale/GARBAGE b/pyramid/tests/localeapp/locale/GARBAGE deleted file mode 100644 index 032c55584..000000000 --- a/pyramid/tests/localeapp/locale/GARBAGE +++ /dev/null @@ -1 +0,0 @@ -Garbage file. diff --git a/pyramid/tests/localeapp/locale/be/LC_MESSAGES b/pyramid/tests/localeapp/locale/be/LC_MESSAGES deleted file mode 100644 index 909cf6a3b..000000000 --- a/pyramid/tests/localeapp/locale/be/LC_MESSAGES +++ /dev/null @@ -1 +0,0 @@ -busted. diff --git a/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/pyramid/tests/localeapp/locale2/GARBAGE b/pyramid/tests/localeapp/locale2/GARBAGE deleted file mode 100644 index 032c55584..000000000 --- a/pyramid/tests/localeapp/locale2/GARBAGE +++ /dev/null @@ -1 +0,0 @@ -Garbage file. diff --git a/pyramid/tests/localeapp/locale2/be/LC_MESSAGES b/pyramid/tests/localeapp/locale2/be/LC_MESSAGES deleted file mode 100644 index 909cf6a3b..000000000 --- a/pyramid/tests/localeapp/locale2/be/LC_MESSAGES +++ /dev/null @@ -1 +0,0 @@ -busted. diff --git a/pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/pyramid/tests/localeapp/locale2/de/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/pyramid/tests/localeapp/locale2/en/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/pyramid/tests/localeapp/locale3/GARBAGE b/pyramid/tests/localeapp/locale3/GARBAGE deleted file mode 100644 index 032c55584..000000000 --- a/pyramid/tests/localeapp/locale3/GARBAGE +++ /dev/null @@ -1 +0,0 @@ -Garbage file. diff --git a/pyramid/tests/localeapp/locale3/be/LC_MESSAGES b/pyramid/tests/localeapp/locale3/be/LC_MESSAGES deleted file mode 100644 index 909cf6a3b..000000000 --- a/pyramid/tests/localeapp/locale3/be/LC_MESSAGES +++ /dev/null @@ -1 +0,0 @@ -busted. diff --git a/pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/pyramid/tests/localeapp/locale3/de/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/pyramid/tests/localeapp/locale3/en/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/pyramid/tests/permbugapp/__init__.py b/pyramid/tests/permbugapp/__init__.py deleted file mode 100644 index 10a244f3b..000000000 --- a/pyramid/tests/permbugapp/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -from cgi import escape -from pyramid.security import view_execution_permitted -from webob import Response - -def x_view(request): # pragma: no cover - return Response('this is private!') - -def test(context, request): - # should return false - msg = 'Allow ./x? %s' % repr(view_execution_permitted( - context, request, 'x')) - return Response(escape(msg)) - -def includeme(config): - from pyramid.authentication import AuthTktAuthenticationPolicy - from pyramid.authorization import ACLAuthorizationPolicy - authn_policy = AuthTktAuthenticationPolicy('seekt1t') - authz_policy = ACLAuthorizationPolicy() - config.set_authentication_policy(authn_policy) - config.set_authorization_policy(authz_policy) - config.add_view(test, name='test') - config.add_view(x_view, name='x', permission='private') diff --git a/pyramid/tests/pkgs/__init__.py b/pyramid/tests/pkgs/__init__.py new file mode 100644 index 000000000..5bb534f79 --- /dev/null +++ b/pyramid/tests/pkgs/__init__.py @@ -0,0 +1 @@ +# package diff --git a/pyramid/tests/pkgs/ccbugapp/__init__.py b/pyramid/tests/pkgs/ccbugapp/__init__.py new file mode 100644 index 000000000..afe21d4e0 --- /dev/null +++ b/pyramid/tests/pkgs/ccbugapp/__init__.py @@ -0,0 +1,16 @@ +from webob import Response + +def rdf_view(request): + """ """ + return Response('rdf') + +def juri_view(request): + """ """ + return Response('juri') + +def includeme(config): + config.add_route('rdf', 'licenses/:license_code/:license_version/rdf') + config.add_route('juri', + 'licenses/:license_code/:license_version/:jurisdiction') + config.add_view(rdf_view, route_name='rdf') + config.add_view(juri_view, route_name='juri') diff --git a/pyramid/tests/pkgs/conflictapp/__init__.py b/pyramid/tests/pkgs/conflictapp/__init__.py new file mode 100644 index 000000000..07bef0832 --- /dev/null +++ b/pyramid/tests/pkgs/conflictapp/__init__.py @@ -0,0 +1,23 @@ +from pyramid.response import Response +from pyramid.authentication import AuthTktAuthenticationPolicy +from pyramid.authorization import ACLAuthorizationPolicy + +def aview(request): + return Response('a view') + +def routeview(request): + return Response('route view') + +def protectedview(request): + return Response('protected view') + +def includeme(config): + # purposely sorta-randomly ordered (route comes after view naming it, + # authz comes after views) + config.add_view(aview) + config.add_view(protectedview, name='protected', permission='view') + config.add_view(routeview, route_name='aroute') + config.add_route('aroute', '/route') + config.set_authentication_policy(AuthTktAuthenticationPolicy('seekri1t')) + config.set_authorization_policy(ACLAuthorizationPolicy()) + config.include('pyramid.tests.pkgs.conflictapp.included') diff --git a/pyramid/tests/pkgs/conflictapp/included.py b/pyramid/tests/pkgs/conflictapp/included.py new file mode 100644 index 000000000..0b76fb2bc --- /dev/null +++ b/pyramid/tests/pkgs/conflictapp/included.py @@ -0,0 +1,6 @@ +from webob import Response + +def bview(request): return Response('b view') + +def includeme(config): + config.add_view(bview) diff --git a/pyramid/tests/pkgs/defpermbugapp/__init__.py b/pyramid/tests/pkgs/defpermbugapp/__init__.py new file mode 100644 index 000000000..1ce0ff32d --- /dev/null +++ b/pyramid/tests/pkgs/defpermbugapp/__init__.py @@ -0,0 +1,26 @@ +from webob import Response +from pyramid.security import NO_PERMISSION_REQUIRED +from pyramid.view import view_config + +@view_config(name='x') +def x_view(request): # pragma: no cover + return Response('this is private!') + +@view_config(name='y', permission='private2') +def y_view(request): # pragma: no cover + return Response('this is private too!') + +@view_config(name='z', permission=NO_PERMISSION_REQUIRED) +def z_view(request): + return Response('this is public') + +def includeme(config): + from pyramid.authorization import ACLAuthorizationPolicy + from pyramid.authentication import AuthTktAuthenticationPolicy + authn_policy = AuthTktAuthenticationPolicy('seekt1t') + authz_policy = ACLAuthorizationPolicy() + config.scan('pyramid.tests.pkgs.defpermbugapp') + config._set_authentication_policy(authn_policy) + config._set_authorization_policy(authz_policy) + config.set_default_permission('private') + diff --git a/pyramid/tests/pkgs/exceptionviewapp/__init__.py b/pyramid/tests/pkgs/exceptionviewapp/__init__.py new file mode 100644 index 000000000..f169e0cd5 --- /dev/null +++ b/pyramid/tests/pkgs/exceptionviewapp/__init__.py @@ -0,0 +1,23 @@ +def includeme(config): + config.add_route('route_raise_exception', 'route_raise_exception') + config.add_route('route_raise_exception2', 'route_raise_exception2', + factory='.models.route_factory') + config.add_route('route_raise_exception3', 'route_raise_exception3', + factory='.models.route_factory2') + config.add_route('route_raise_exception4', 'route_raise_exception4') + config.add_view('.views.maybe') + config.add_view('.views.no', context='.models.NotAnException') + config.add_view('.views.yes', context=".models.AnException") + config.add_view('.views.raise_exception', name='raise_exception') + config.add_view('.views.raise_exception', + route_name='route_raise_exception') + config.add_view('.views.raise_exception', + route_name='route_raise_exception2') + config.add_view('.views.raise_exception', + route_name='route_raise_exception3') + config.add_view('.views.whoa', context='.models.AnException', + route_name='route_raise_exception3') + config.add_view('.views.raise_exception', + route_name='route_raise_exception4') + config.add_view('.views.whoa', context='.models.AnException', + route_name='route_raise_exception4') diff --git a/pyramid/tests/pkgs/exceptionviewapp/models.py b/pyramid/tests/pkgs/exceptionviewapp/models.py new file mode 100644 index 000000000..fe407badc --- /dev/null +++ b/pyramid/tests/pkgs/exceptionviewapp/models.py @@ -0,0 +1,18 @@ + +class NotAnException(object): + pass + +class AnException(Exception): + pass + +class RouteContext(object): + pass + +class RouteContext2(object): + pass + +def route_factory(*arg): + return RouteContext() + +def route_factory2(*arg): + return RouteContext2() diff --git a/pyramid/tests/pkgs/exceptionviewapp/views.py b/pyramid/tests/pkgs/exceptionviewapp/views.py new file mode 100644 index 000000000..1432618cf --- /dev/null +++ b/pyramid/tests/pkgs/exceptionviewapp/views.py @@ -0,0 +1,17 @@ +from webob import Response +from models import AnException + +def no(request): + return Response('no') + +def yes(request): + return Response('yes') + +def maybe(request): + return Response('maybe') + +def whoa(request): + return Response('whoa') + +def raise_exception(request): + raise AnException() diff --git a/pyramid/tests/pkgs/fixtureapp/__init__.py b/pyramid/tests/pkgs/fixtureapp/__init__.py new file mode 100644 index 000000000..c74747bfd --- /dev/null +++ b/pyramid/tests/pkgs/fixtureapp/__init__.py @@ -0,0 +1,12 @@ +def includeme(config): + config.add_view('.views.fixture_view') + config.add_view('.views.exception_view', context=RuntimeError) + config.add_view('.views.protected_view', name='protected.html') + config.add_view('.views.erroneous_view', name='error.html') + config.add_view('.views.fixture_view', name='dummyskin.html', + request_type='.views.IDummy') + from models import fixture, IFixture + config.registry.registerUtility(fixture, IFixture) + config.add_view('.views.fixture_view', name='another.html') + + diff --git a/pyramid/tests/pkgs/fixtureapp/models.py b/pyramid/tests/pkgs/fixtureapp/models.py new file mode 100644 index 000000000..d80d14bb3 --- /dev/null +++ b/pyramid/tests/pkgs/fixtureapp/models.py @@ -0,0 +1,8 @@ +from zope.interface import Interface + +class IFixture(Interface): + pass + +def fixture(): + """ """ + diff --git a/pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py b/pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py new file mode 100644 index 000000000..d3173e636 --- /dev/null +++ b/pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py @@ -0,0 +1 @@ +#package diff --git a/pyramid/tests/pkgs/fixtureapp/subpackage/templates/bar.pt b/pyramid/tests/pkgs/fixtureapp/subpackage/templates/bar.pt new file mode 100644 index 000000000..90531a4b3 --- /dev/null +++ b/pyramid/tests/pkgs/fixtureapp/subpackage/templates/bar.pt @@ -0,0 +1,2 @@ + + diff --git a/pyramid/tests/pkgs/fixtureapp/templates/fixture.pt b/pyramid/tests/pkgs/fixtureapp/templates/fixture.pt new file mode 100644 index 000000000..06dd4e2b1 --- /dev/null +++ b/pyramid/tests/pkgs/fixtureapp/templates/fixture.pt @@ -0,0 +1,6 @@ + + + + + diff --git a/pyramid/tests/pkgs/fixtureapp/views.py b/pyramid/tests/pkgs/fixtureapp/views.py new file mode 100644 index 000000000..cbfc5a574 --- /dev/null +++ b/pyramid/tests/pkgs/fixtureapp/views.py @@ -0,0 +1,22 @@ +from zope.interface import Interface +from webob import Response +from pyramid.httpexceptions import HTTPForbidden + +def fixture_view(context, request): + """ """ + return Response('fixture') + +def erroneous_view(context, request): + """ """ + raise RuntimeError() + +def exception_view(context, request): + """ """ + return Response('supressed') + +def protected_view(context, request): + """ """ + raise HTTPForbidden() + +class IDummy(Interface): + pass diff --git a/pyramid/tests/pkgs/forbiddenapp/__init__.py b/pyramid/tests/pkgs/forbiddenapp/__init__.py new file mode 100644 index 000000000..7001b87f5 --- /dev/null +++ b/pyramid/tests/pkgs/forbiddenapp/__init__.py @@ -0,0 +1,23 @@ +from webob import Response +from pyramid.httpexceptions import HTTPForbidden + +def x_view(request): # pragma: no cover + return Response('this is private!') + +def forbidden_view(context, request): + msg = context.message + result = context.result + message = msg + '\n' + str(result) + resp = HTTPForbidden() + resp.body = message + return resp + +def includeme(config): + from pyramid.authentication import AuthTktAuthenticationPolicy + from pyramid.authorization import ACLAuthorizationPolicy + authn_policy = AuthTktAuthenticationPolicy('seekr1t') + authz_policy = ACLAuthorizationPolicy() + config._set_authentication_policy(authn_policy) + config._set_authorization_policy(authz_policy) + config.add_view(x_view, name='x', permission='private') + config.add_view(forbidden_view, context=HTTPForbidden) diff --git a/pyramid/tests/pkgs/hybridapp/__init__.py b/pyramid/tests/pkgs/hybridapp/__init__.py new file mode 100644 index 000000000..1cc2dde83 --- /dev/null +++ b/pyramid/tests/pkgs/hybridapp/__init__.py @@ -0,0 +1,39 @@ +def includeme(config): + # + config.add_route('route', 'abc') + config.add_view('.views.route_view', route_name='route') + # + config.add_view('.views.global_view', + context='pyramid.traversal.DefaultRootFactory') + config.add_view('.views.global2_view', + context='pyramid.traversal.DefaultRootFactory', + name='global2') + config.add_route('route2', 'def') + # + config.add_view('.views.route2_view', route_name='route2') + + # + config.add_route('route3', 'ghi', use_global_views=True) + # + config.add_route('route4', 'jkl') + # + config.add_route('route5', 'mno/*traverse') + # + config.add_route('route6', 'pqr/*traverse', use_global_views=True) + config.add_route('route7', 'error') + config.add_view('.views.erroneous_view', route_name='route7') + config.add_route('route8', 'error2') + config.add_view('.views.erroneous_view', route_name='route8') + # + config.add_view('.views.exception_view', context=RuntimeError) + # + config.add_view('.views.exception2_view', context=RuntimeError, + route_name='route8') + config.add_route('route9', 'error_sub') + config.add_view('.views.erroneous_sub_view', route_name='route9') + # + config.add_view('.views.exception2_view', context='.views.SuperException', + route_name='route9') + # + config.add_view('.views.exception_view', context='.views.SubException') diff --git a/pyramid/tests/pkgs/hybridapp/views.py b/pyramid/tests/pkgs/hybridapp/views.py new file mode 100644 index 000000000..135ef8290 --- /dev/null +++ b/pyramid/tests/pkgs/hybridapp/views.py @@ -0,0 +1,39 @@ +from webob import Response + +def route_view(request): + """ """ + return Response('route') + +def global_view(request): + """ """ + return Response('global') + +def global2_view(request): + """ """ + return Response('global2') + +def route2_view(request): + """ """ + return Response('route2') + +def exception_view(request): + """ """ + return Response('supressed') + +def exception2_view(request): + """ """ + return Response('supressed2') + +def erroneous_view(request): + """ """ + raise RuntimeError() + +def erroneous_sub_view(request): + """ """ + raise SubException() + +class SuperException(Exception): + """ """ + +class SubException(SuperException): + """ """ diff --git a/pyramid/tests/pkgs/includeapp1/__init__.py b/pyramid/tests/pkgs/includeapp1/__init__.py new file mode 100644 index 000000000..eaeeb7ef6 --- /dev/null +++ b/pyramid/tests/pkgs/includeapp1/__init__.py @@ -0,0 +1 @@ +# include app diff --git a/pyramid/tests/pkgs/includeapp1/root.py b/pyramid/tests/pkgs/includeapp1/root.py new file mode 100644 index 000000000..f56203cfa --- /dev/null +++ b/pyramid/tests/pkgs/includeapp1/root.py @@ -0,0 +1,10 @@ +from pyramid.response import Response + +def aview(request): + return Response('root') + +def configure(config): + config.add_view(aview) + config.include('pyramid.tests.pkgs.includeapp1.two.configure') + config.commit() + diff --git a/pyramid/tests/pkgs/includeapp1/three.py b/pyramid/tests/pkgs/includeapp1/three.py new file mode 100644 index 000000000..e7131bcf5 --- /dev/null +++ b/pyramid/tests/pkgs/includeapp1/three.py @@ -0,0 +1,10 @@ +from pyramid.response import Response + +def aview(request): + return Response('three') + +def configure(config): + config.add_view(aview, name='three') + config.include('pyramid.tests.pkgs.includeapp1.two.configure') # should not cycle + config.add_view(aview) # will be overridden by root when resolved + diff --git a/pyramid/tests/pkgs/includeapp1/two.py b/pyramid/tests/pkgs/includeapp1/two.py new file mode 100644 index 000000000..99b0f883a --- /dev/null +++ b/pyramid/tests/pkgs/includeapp1/two.py @@ -0,0 +1,9 @@ +from pyramid.response import Response + +def aview(request): + return Response('two') + +def configure(config): + config.add_view(aview, name='two') + config.include('pyramid.tests.pkgs.includeapp1.three.configure') + config.add_view(aview) # will be overridden by root when resolved diff --git a/pyramid/tests/pkgs/localeapp/__init__.py b/pyramid/tests/pkgs/localeapp/__init__.py new file mode 100644 index 000000000..1a35cdb4a --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/__init__.py @@ -0,0 +1 @@ +# a file diff --git a/pyramid/tests/pkgs/localeapp/locale/GARBAGE b/pyramid/tests/pkgs/localeapp/locale/GARBAGE new file mode 100644 index 000000000..032c55584 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale/GARBAGE @@ -0,0 +1 @@ +Garbage file. diff --git a/pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES b/pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES new file mode 100644 index 000000000..909cf6a3b --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES @@ -0,0 +1 @@ +busted. diff --git a/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo b/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo differ diff --git a/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po b/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo b/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo differ diff --git a/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po b/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/pyramid/tests/pkgs/localeapp/locale2/GARBAGE b/pyramid/tests/pkgs/localeapp/locale2/GARBAGE new file mode 100644 index 000000000..032c55584 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale2/GARBAGE @@ -0,0 +1 @@ +Garbage file. diff --git a/pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES b/pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES new file mode 100644 index 000000000..909cf6a3b --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES @@ -0,0 +1 @@ +busted. diff --git a/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo b/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo differ diff --git a/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po b/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo b/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo differ diff --git a/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po b/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/pyramid/tests/pkgs/localeapp/locale3/GARBAGE b/pyramid/tests/pkgs/localeapp/locale3/GARBAGE new file mode 100644 index 000000000..032c55584 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale3/GARBAGE @@ -0,0 +1 @@ +Garbage file. diff --git a/pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES b/pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES new file mode 100644 index 000000000..909cf6a3b --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES @@ -0,0 +1 @@ +busted. diff --git a/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo b/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo differ diff --git a/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po b/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo b/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo differ diff --git a/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po b/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/pyramid/tests/pkgs/permbugapp/__init__.py b/pyramid/tests/pkgs/permbugapp/__init__.py new file mode 100644 index 000000000..10a244f3b --- /dev/null +++ b/pyramid/tests/pkgs/permbugapp/__init__.py @@ -0,0 +1,22 @@ +from cgi import escape +from pyramid.security import view_execution_permitted +from webob import Response + +def x_view(request): # pragma: no cover + return Response('this is private!') + +def test(context, request): + # should return false + msg = 'Allow ./x? %s' % repr(view_execution_permitted( + context, request, 'x')) + return Response(escape(msg)) + +def includeme(config): + from pyramid.authentication import AuthTktAuthenticationPolicy + from pyramid.authorization import ACLAuthorizationPolicy + authn_policy = AuthTktAuthenticationPolicy('seekt1t') + authz_policy = ACLAuthorizationPolicy() + config.set_authentication_policy(authn_policy) + config.set_authorization_policy(authz_policy) + config.add_view(test, name='test') + config.add_view(x_view, name='x', permission='private') diff --git a/pyramid/tests/pkgs/rendererscanapp/__init__.py b/pyramid/tests/pkgs/rendererscanapp/__init__.py new file mode 100644 index 000000000..1baec0940 --- /dev/null +++ b/pyramid/tests/pkgs/rendererscanapp/__init__.py @@ -0,0 +1,9 @@ +from pyramid.view import view_config + +@view_config(name='one', renderer='one.pt') +def one(request): + return {'name':'One!'} + +def includeme(config): + config.scan() + diff --git a/pyramid/tests/pkgs/rendererscanapp/one.pt b/pyramid/tests/pkgs/rendererscanapp/one.pt new file mode 100644 index 000000000..42114d94f --- /dev/null +++ b/pyramid/tests/pkgs/rendererscanapp/one.pt @@ -0,0 +1,4 @@ +
+ ${name} +
diff --git a/pyramid/tests/pkgs/rendererscanapp/two/__init__.py b/pyramid/tests/pkgs/rendererscanapp/two/__init__.py new file mode 100644 index 000000000..be0077fcb --- /dev/null +++ b/pyramid/tests/pkgs/rendererscanapp/two/__init__.py @@ -0,0 +1,6 @@ +from pyramid.view import view_config + +@view_config(name='two', renderer='two.pt') +def two(request): + return {'nameagain':'Two!'} + diff --git a/pyramid/tests/pkgs/rendererscanapp/two/two.pt b/pyramid/tests/pkgs/rendererscanapp/two/two.pt new file mode 100644 index 000000000..7eff97c22 --- /dev/null +++ b/pyramid/tests/pkgs/rendererscanapp/two/two.pt @@ -0,0 +1,4 @@ +
+ ${nameagain} +
diff --git a/pyramid/tests/pkgs/restbugapp/__init__.py b/pyramid/tests/pkgs/restbugapp/__init__.py new file mode 100644 index 000000000..9ad79e32e --- /dev/null +++ b/pyramid/tests/pkgs/restbugapp/__init__.py @@ -0,0 +1,15 @@ +def includeme(config): + config.add_route('gameactions_pet_get_pets', '/pet', + request_method='GET') + config.add_route('gameactions_pet_care_for_pet', '/pet', + request_method='POST') + config.add_view('.views.PetRESTView', + route_name='gameactions_pet_get_pets', + attr='GET', + permission='view', + renderer='json') + config.add_view('.views.PetRESTView', + route_name='gameactions_pet_care_for_pet', + attr='POST', + permission='view', + renderer='json') diff --git a/pyramid/tests/pkgs/restbugapp/views.py b/pyramid/tests/pkgs/restbugapp/views.py new file mode 100644 index 000000000..2ace59fa9 --- /dev/null +++ b/pyramid/tests/pkgs/restbugapp/views.py @@ -0,0 +1,15 @@ +from pyramid.response import Response + +class BaseRESTView(object): + def __init__(self, context, request): + self.context = context + self.request = request + +class PetRESTView(BaseRESTView): + """ REST Controller to control action of an avatar """ + def __init__(self, context, request): + super(PetRESTView, self).__init__(context, request) + + def GET(self): + return Response('gotten') + diff --git a/pyramid/tests/pkgs/staticpermapp/__init__.py b/pyramid/tests/pkgs/staticpermapp/__init__.py new file mode 100644 index 000000000..cc690d937 --- /dev/null +++ b/pyramid/tests/pkgs/staticpermapp/__init__.py @@ -0,0 +1,25 @@ +class RootFactory(object): + __acl__ = [('Allow', 'fred', 'view')] + def __init__(self, request): + pass + +class LocalRootFactory(object): + __acl__ = [('Allow', 'bob', 'view')] + def __init__(self, request): + pass + + +def includeme(config): + from pyramid.authentication import RemoteUserAuthenticationPolicy + from pyramid.authorization import ACLAuthorizationPolicy + authn_policy = RemoteUserAuthenticationPolicy() + authz_policy = ACLAuthorizationPolicy() + config._set_authentication_policy(authn_policy) + config._set_authorization_policy(authz_policy) + config.add_static_view('allowed', 'pyramid.tests:fixtures/static/') + config.add_static_view('protected', 'pyramid.tests:fixtures/static/', + permission='view') + config.add_static_view('factory_protected', + 'pyramid.tests:fixtures/static/', + permission='view', + factory=LocalRootFactory) diff --git a/pyramid/tests/pkgs/viewdecoratorapp/__init__.py b/pyramid/tests/pkgs/viewdecoratorapp/__init__.py new file mode 100644 index 000000000..5fa98062a --- /dev/null +++ b/pyramid/tests/pkgs/viewdecoratorapp/__init__.py @@ -0,0 +1,3 @@ +def includeme(config): + config.scan('pyramid.tests.pkgs.viewdecoratorapp') + diff --git a/pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py b/pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py new file mode 100644 index 000000000..5bb534f79 --- /dev/null +++ b/pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py @@ -0,0 +1 @@ +# package diff --git a/pyramid/tests/pkgs/viewdecoratorapp/views/templates/foo.mak b/pyramid/tests/pkgs/viewdecoratorapp/views/templates/foo.mak new file mode 100644 index 000000000..6a2f701b6 --- /dev/null +++ b/pyramid/tests/pkgs/viewdecoratorapp/views/templates/foo.mak @@ -0,0 +1,3 @@ + +${result} + diff --git a/pyramid/tests/pkgs/viewdecoratorapp/views/views.py b/pyramid/tests/pkgs/viewdecoratorapp/views/views.py new file mode 100644 index 000000000..6f7ff1e21 --- /dev/null +++ b/pyramid/tests/pkgs/viewdecoratorapp/views/views.py @@ -0,0 +1,12 @@ +from pyramid.view import view_config + +@view_config(renderer='templates/foo.mak', name='first') +def first(request): + return {'result':'OK1'} + +@view_config( + renderer='pyramid.tests.pkgs.viewdecoratorapp.views:templates/foo.mak', + name='second') +def second(request): + return {'result':'OK2'} + diff --git a/pyramid/tests/pkgs/wsgiapp2app/__init__.py b/pyramid/tests/pkgs/wsgiapp2app/__init__.py new file mode 100644 index 000000000..0880556ef --- /dev/null +++ b/pyramid/tests/pkgs/wsgiapp2app/__init__.py @@ -0,0 +1,17 @@ +from pyramid.view import view_config +from pyramid.wsgi import wsgiapp2 + +@view_config(name='hello', renderer='string') +@wsgiapp2 +def hello(environ, start_response): + assert environ['PATH_INFO'] == '/' + assert environ['SCRIPT_NAME'] == '/hello' + response_headers = [('Content-Type', 'text/plain')] + start_response('200 OK', response_headers) + return ['Hello!'] + +def main(): + from pyramid.config import Configurator + c = Configurator() + c.scan() + return c diff --git a/pyramid/tests/rendererscanapp/__init__.py b/pyramid/tests/rendererscanapp/__init__.py deleted file mode 100644 index 1baec0940..000000000 --- a/pyramid/tests/rendererscanapp/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -from pyramid.view import view_config - -@view_config(name='one', renderer='one.pt') -def one(request): - return {'name':'One!'} - -def includeme(config): - config.scan() - diff --git a/pyramid/tests/rendererscanapp/one.pt b/pyramid/tests/rendererscanapp/one.pt deleted file mode 100644 index 42114d94f..000000000 --- a/pyramid/tests/rendererscanapp/one.pt +++ /dev/null @@ -1,4 +0,0 @@ -
- ${name} -
diff --git a/pyramid/tests/rendererscanapp/two/__init__.py b/pyramid/tests/rendererscanapp/two/__init__.py deleted file mode 100644 index be0077fcb..000000000 --- a/pyramid/tests/rendererscanapp/two/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from pyramid.view import view_config - -@view_config(name='two', renderer='two.pt') -def two(request): - return {'nameagain':'Two!'} - diff --git a/pyramid/tests/rendererscanapp/two/two.pt b/pyramid/tests/rendererscanapp/two/two.pt deleted file mode 100644 index 7eff97c22..000000000 --- a/pyramid/tests/rendererscanapp/two/two.pt +++ /dev/null @@ -1,4 +0,0 @@ -
- ${nameagain} -
diff --git a/pyramid/tests/restbugapp/__init__.py b/pyramid/tests/restbugapp/__init__.py deleted file mode 100644 index 9ad79e32e..000000000 --- a/pyramid/tests/restbugapp/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -def includeme(config): - config.add_route('gameactions_pet_get_pets', '/pet', - request_method='GET') - config.add_route('gameactions_pet_care_for_pet', '/pet', - request_method='POST') - config.add_view('.views.PetRESTView', - route_name='gameactions_pet_get_pets', - attr='GET', - permission='view', - renderer='json') - config.add_view('.views.PetRESTView', - route_name='gameactions_pet_care_for_pet', - attr='POST', - permission='view', - renderer='json') diff --git a/pyramid/tests/restbugapp/views.py b/pyramid/tests/restbugapp/views.py deleted file mode 100644 index 2ace59fa9..000000000 --- a/pyramid/tests/restbugapp/views.py +++ /dev/null @@ -1,15 +0,0 @@ -from pyramid.response import Response - -class BaseRESTView(object): - def __init__(self, context, request): - self.context = context - self.request = request - -class PetRESTView(BaseRESTView): - """ REST Controller to control action of an avatar """ - def __init__(self, context, request): - super(PetRESTView, self).__init__(context, request) - - def GET(self): - return Response('gotten') - diff --git a/pyramid/tests/staticpermapp/__init__.py b/pyramid/tests/staticpermapp/__init__.py deleted file mode 100644 index cc690d937..000000000 --- a/pyramid/tests/staticpermapp/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -class RootFactory(object): - __acl__ = [('Allow', 'fred', 'view')] - def __init__(self, request): - pass - -class LocalRootFactory(object): - __acl__ = [('Allow', 'bob', 'view')] - def __init__(self, request): - pass - - -def includeme(config): - from pyramid.authentication import RemoteUserAuthenticationPolicy - from pyramid.authorization import ACLAuthorizationPolicy - authn_policy = RemoteUserAuthenticationPolicy() - authz_policy = ACLAuthorizationPolicy() - config._set_authentication_policy(authn_policy) - config._set_authorization_policy(authz_policy) - config.add_static_view('allowed', 'pyramid.tests:fixtures/static/') - config.add_static_view('protected', 'pyramid.tests:fixtures/static/', - permission='view') - config.add_static_view('factory_protected', - 'pyramid.tests:fixtures/static/', - permission='view', - factory=LocalRootFactory) diff --git a/pyramid/tests/test_config/test_i18n.py b/pyramid/tests/test_config/test_i18n.py index 3fdbf76e3..03b410445 100644 --- a/pyramid/tests/test_config/test_i18n.py +++ b/pyramid/tests/test_config/test_i18n.py @@ -5,11 +5,11 @@ from pyramid.tests.test_config import dummyfactory here = os.path.dirname(__file__) locale = os.path.abspath( - os.path.join(here, '..', 'localeapp', 'locale')) + os.path.join(here, '..', 'pkgs', 'localeapp', 'locale')) locale2 = os.path.abspath( - os.path.join(here, '..', 'localeapp', 'locale2')) + os.path.join(here, '..', 'pkgs', 'localeapp', 'locale2')) locale3 = os.path.abspath( - os.path.join(here, '..', 'localeapp', 'locale3')) + os.path.join(here, '..', 'pkgs', 'localeapp', 'locale3')) class TestI18NConfiguratorMixin(unittest.TestCase): def _makeOne(self, *arg, **kw): @@ -53,7 +53,7 @@ class TestI18NConfiguratorMixin(unittest.TestCase): def test_add_translation_dirs_asset_spec(self): from pyramid.interfaces import ITranslationDirectories config = self._makeOne(autocommit=True) - config.add_translation_dirs('pyramid.tests.localeapp:locale') + config.add_translation_dirs('pyramid.tests.pkgs.localeapp:locale') self.assertEqual(config.registry.getUtility(ITranslationDirectories), [locale]) @@ -62,24 +62,24 @@ class TestI18NConfiguratorMixin(unittest.TestCase): config = self._makeOne(autocommit=True) directories = ['abc'] config.registry.registerUtility(directories, ITranslationDirectories) - config.add_translation_dirs('pyramid.tests.localeapp:locale') + config.add_translation_dirs('pyramid.tests.pkgs.localeapp:locale') result = config.registry.getUtility(ITranslationDirectories) self.assertEqual(result, [locale, 'abc']) def test_add_translation_dirs_multiple_specs(self): from pyramid.interfaces import ITranslationDirectories config = self._makeOne(autocommit=True) - config.add_translation_dirs('pyramid.tests.localeapp:locale', - 'pyramid.tests.localeapp:locale2') + config.add_translation_dirs('pyramid.tests.pkgs.localeapp:locale', + 'pyramid.tests.pkgs.localeapp:locale2') self.assertEqual(config.registry.getUtility(ITranslationDirectories), [locale, locale2]) def test_add_translation_dirs_multiple_specs_multiple_calls(self): from pyramid.interfaces import ITranslationDirectories config = self._makeOne(autocommit=True) - config.add_translation_dirs('pyramid.tests.localeapp:locale', - 'pyramid.tests.localeapp:locale2') - config.add_translation_dirs('pyramid.tests.localeapp:locale3') + config.add_translation_dirs('pyramid.tests.pkgs.localeapp:locale', + 'pyramid.tests.pkgs.localeapp:locale2') + config.add_translation_dirs('pyramid.tests.pkgs.localeapp:locale3') self.assertEqual(config.registry.getUtility(ITranslationDirectories), [locale3, locale, locale2]) @@ -90,7 +90,7 @@ class TestI18NConfiguratorMixin(unittest.TestCase): config = self._makeOne(autocommit=True) manager.push({'request':request, 'registry':config.registry}) try: - config.add_translation_dirs('pyramid.tests.localeapp:locale') + config.add_translation_dirs('pyramid.tests.pkgs.localeapp:locale') translate = config.registry.getUtility(IChameleonTranslate) self.assertEqual(translate('Approve'), u'Approve') finally: diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py index 6a3ab9391..a4a53bd3a 100644 --- a/pyramid/tests/test_config/test_views.py +++ b/pyramid/tests/test_config/test_views.py @@ -3507,4 +3507,3 @@ class DummyStaticURLInfo: def add(self, name, spec, **kw): self.added.append((name, spec, kw)) - diff --git a/pyramid/tests/test_i18n.py b/pyramid/tests/test_i18n.py index fcc41b08e..2abd35bdd 100644 --- a/pyramid/tests/test_i18n.py +++ b/pyramid/tests/test_i18n.py @@ -1,5 +1,9 @@ # -*- coding: utf-8 -*- # +import os + +here = os.path.dirname(__file__) +localedir = os.path.join(here, 'pkgs', 'localeapp', 'locale') import unittest from pyramid.testing import cleanUp @@ -176,10 +180,7 @@ class Test_make_localizer(unittest.TestCase): return make_localizer(locale, tdirs) def test_locale_from_mo(self): - import os from pyramid.i18n import Localizer - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] locale_name = 'de' result = self._callFUT(locale_name, localedirs) @@ -190,10 +191,7 @@ class Test_make_localizer(unittest.TestCase): self.assertTrue(hasattr(result, 'pluralize')) def test_locale_from_mo_bad_mo(self): - import os from pyramid.i18n import Localizer - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] locale_name = 'be' result = self._callFUT(locale_name, localedirs) @@ -202,10 +200,7 @@ class Test_make_localizer(unittest.TestCase): 'Approve') def test_locale_from_mo_mo_isdir(self): - import os from pyramid.i18n import Localizer - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] locale_name = 'gb' result = self._callFUT(locale_name, localedirs) @@ -214,10 +209,7 @@ class Test_make_localizer(unittest.TestCase): 'Approve') def test_territory_fallback(self): - import os from pyramid.i18n import Localizer - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] locale_name = 'de_DE' result = self._callFUT(locale_name, localedirs) @@ -270,13 +262,10 @@ class Test_get_localizer(unittest.TestCase): self.assertEqual(result, 'abc') def test_locale_from_mo(self): - import os from pyramid.threadlocal import get_current_registry from pyramid.interfaces import ITranslationDirectories from pyramid.i18n import Localizer registry = get_current_registry() - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] registry.registerUtility(localedirs, ITranslationDirectories) request = DummyRequest() @@ -289,13 +278,10 @@ class Test_get_localizer(unittest.TestCase): self.assertTrue(hasattr(result, 'pluralize')) def test_locale_from_mo_bad_mo(self): - import os from pyramid.threadlocal import get_current_registry from pyramid.interfaces import ITranslationDirectories from pyramid.i18n import Localizer registry = get_current_registry() - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] registry.registerUtility(localedirs, ITranslationDirectories) request = DummyRequest() @@ -367,36 +353,24 @@ class TestTranslations(unittest.TestCase): def test_load_locales_None(self): import gettext - import os - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') klass = self._getTargetClass() result = klass.load(localedir, None, domain=None) self.assertEqual(result.__class__, gettext.NullTranslations) def test_load_domain_None(self): import gettext - import os - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') locales = ['de', 'en'] klass = self._getTargetClass() result = klass.load(localedir, locales, domain=None) self.assertEqual(result.__class__, gettext.NullTranslations) def test_load_found_locale_and_domain(self): - import os - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') locales = ['de', 'en'] klass = self._getTargetClass() result = klass.load(localedir, locales, domain='deformsite') self.assertEqual(result.__class__, klass) def test_load_found_locale_and_domain_locale_is_string(self): - import os - here = os.path.dirname(__file__) - localedir = os.path.join(here, 'localeapp', 'locale') locales = 'de' klass = self._getTargetClass() result = klass.load(localedir, locales, domain='deformsite') diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py index 230a0a411..239db58ba 100644 --- a/pyramid/tests/test_integration.py +++ b/pyramid/tests/test_integration.py @@ -138,7 +138,7 @@ class IntegrationBase(unittest.TestCase): self.config.end() class TestFixtureApp(IntegrationBase): - package = 'pyramid.tests.fixtureapp' + package = 'pyramid.tests.pkgs.fixtureapp' def test_another(self): res = self.testapp.get('/another.html', status=200) self.assertEqual(res.body, 'fixture') @@ -158,8 +158,8 @@ class TestFixtureApp(IntegrationBase): self.testapp.get('/protected.html', status=403) class TestStaticPermApp(IntegrationBase): - package = 'pyramid.tests.staticpermapp' - root_factory = 'pyramid.tests.staticpermapp:RootFactory' + package = 'pyramid.tests.pkgs.staticpermapp' + root_factory = 'pyramid.tests.pkgs.staticpermapp:RootFactory' def test_allowed(self): result = self.testapp.get('/allowed/index.html', status=200) self.assertEqual( @@ -191,7 +191,7 @@ class TestStaticPermApp(IntegrationBase): class TestCCBug(IntegrationBase): # "unordered" as reported in IRC by author of # http://labs.creativecommons.org/2010/01/13/cc-engine-and-web-non-frameworks/ - package = 'pyramid.tests.ccbugapp' + package = 'pyramid.tests.pkgs.ccbugapp' def test_rdf(self): res = self.testapp.get('/licenses/1/v1/rdf', status=200) self.assertEqual(res.body, 'rdf') @@ -204,7 +204,7 @@ class TestHybridApp(IntegrationBase): # make sure views registered for a route "win" over views registered # without one, even though the context of the non-route view may # be more specific than the route view. - package = 'pyramid.tests.hybridapp' + package = 'pyramid.tests.pkgs.hybridapp' def test_root(self): res = self.testapp.get('/', status=200) self.assertEqual(res.body, 'global') @@ -245,14 +245,14 @@ class TestHybridApp(IntegrationBase): class TestRestBugApp(IntegrationBase): # test bug reported by delijati 2010/2/3 (http://pastebin.com/d4cc15515) - package = 'pyramid.tests.restbugapp' + package = 'pyramid.tests.pkgs.restbugapp' def test_it(self): res = self.testapp.get('/pet', status=200) self.assertEqual(res.body, 'gotten') class TestForbiddenAppHasResult(IntegrationBase): # test that forbidden exception has ACLDenied result attached - package = 'pyramid.tests.forbiddenapp' + package = 'pyramid.tests.pkgs.forbiddenapp' def test_it(self): res = self.testapp.get('/x', status=403) message, result = [x.strip() for x in res.body.split('\n')] @@ -266,9 +266,11 @@ class TestForbiddenAppHasResult(IntegrationBase): result.endswith("for principals ['system.Everyone']")) class TestViewDecoratorApp(IntegrationBase): - package = 'pyramid.tests.viewdecoratorapp' + package = 'pyramid.tests.pkgs.viewdecoratorapp' def _configure_mako(self): - tmpldir = os.path.join(os.path.dirname(__file__), 'viewdecoratorapp', + tmpldir = os.path.join(os.path.dirname(__file__), + 'pkgs', + 'viewdecoratorapp', 'views') self.config.registry.settings['mako.directories'] = tmpldir @@ -286,7 +288,7 @@ class TestViewDecoratorApp(IntegrationBase): class TestViewPermissionBug(IntegrationBase): # view_execution_permitted bug as reported by Shane at http://lists.repoze.org/pipermail/repoze-dev/2010-October/003603.html - package = 'pyramid.tests.permbugapp' + package = 'pyramid.tests.pkgs.permbugapp' def test_test(self): res = self.testapp.get('/test', status=200) self.assertTrue('ACLDenied' in res.body) @@ -296,7 +298,7 @@ class TestViewPermissionBug(IntegrationBase): class TestDefaultViewPermissionBug(IntegrationBase): # default_view_permission bug as reported by Wiggy at http://lists.repoze.org/pipermail/repoze-dev/2010-October/003602.html - package = 'pyramid.tests.defpermbugapp' + package = 'pyramid.tests.pkgs.defpermbugapp' def test_x(self): res = self.testapp.get('/x', status=403) self.assertTrue('failed permission check' in res.body) @@ -309,12 +311,13 @@ class TestDefaultViewPermissionBug(IntegrationBase): res = self.testapp.get('/z', status=200) self.assertTrue('public' in res.body) -from pyramid.tests.exceptionviewapp.models import AnException, NotAnException +from pyramid.tests.pkgs.exceptionviewapp.models import \ + AnException, NotAnException excroot = {'anexception':AnException(), 'notanexception':NotAnException()} class TestExceptionViewsApp(IntegrationBase): - package = 'pyramid.tests.exceptionviewapp' + package = 'pyramid.tests.pkgs.exceptionviewapp' root_factory = lambda *arg: excroot def test_root(self): res = self.testapp.get('/', status=200) @@ -345,7 +348,7 @@ class TestExceptionViewsApp(IntegrationBase): self.assertTrue('whoa' in res.body) class TestConflictApp(unittest.TestCase): - package = 'pyramid.tests.conflictapp' + package = 'pyramid.tests.pkgs.conflictapp' def _makeConfig(self): from pyramid.config import Configurator config = Configurator() @@ -413,7 +416,7 @@ class ImperativeIncludeConfigurationTest(unittest.TestCase): def setUp(self): from pyramid.config import Configurator config = Configurator() - from pyramid.tests.includeapp1.root import configure + from pyramid.tests.pkgs.includeapp1.root import configure configure(config) app = config.make_wsgi_app() from webtest import TestApp @@ -457,7 +460,7 @@ class SelfScanAppTest(unittest.TestCase): class WSGIApp2AppTest(unittest.TestCase): def setUp(self): - from pyramid.tests.wsgiapp2app import main + from pyramid.tests.pkgs.wsgiapp2app import main config = main() app = config.make_wsgi_app() from webtest import TestApp @@ -473,7 +476,7 @@ class WSGIApp2AppTest(unittest.TestCase): if os.name != 'java': # uses chameleon class RendererScanAppTest(IntegrationBase): - package = 'pyramid.tests.rendererscanapp' + package = 'pyramid.tests.pkgs.rendererscanapp' def test_root(self): res = self.testapp.get('/one', status=200) self.assertTrue('One!' in res.body) @@ -483,7 +486,7 @@ if os.name != 'java': # uses chameleon self.assertTrue('Two!' in res.body) def test_rescan(self): - self.config.scan('pyramid.tests.rendererscanapp') + self.config.scan('pyramid.tests.pkgs.rendererscanapp') app = self.config.make_wsgi_app() from webtest import TestApp testapp = TestApp(app) diff --git a/pyramid/tests/viewdecoratorapp/__init__.py b/pyramid/tests/viewdecoratorapp/__init__.py deleted file mode 100644 index ad2890d92..000000000 --- a/pyramid/tests/viewdecoratorapp/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -def includeme(config): - config.scan('pyramid.tests.viewdecoratorapp') - diff --git a/pyramid/tests/viewdecoratorapp/views/__init__.py b/pyramid/tests/viewdecoratorapp/views/__init__.py deleted file mode 100644 index 5bb534f79..000000000 --- a/pyramid/tests/viewdecoratorapp/views/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# package diff --git a/pyramid/tests/viewdecoratorapp/views/templates/foo.mak b/pyramid/tests/viewdecoratorapp/views/templates/foo.mak deleted file mode 100644 index 6a2f701b6..000000000 --- a/pyramid/tests/viewdecoratorapp/views/templates/foo.mak +++ /dev/null @@ -1,3 +0,0 @@ - -${result} - diff --git a/pyramid/tests/viewdecoratorapp/views/views.py b/pyramid/tests/viewdecoratorapp/views/views.py deleted file mode 100644 index 0b3147c86..000000000 --- a/pyramid/tests/viewdecoratorapp/views/views.py +++ /dev/null @@ -1,11 +0,0 @@ -from pyramid.view import view_config - -@view_config(renderer='templates/foo.mak', name='first') -def first(request): - return {'result':'OK1'} - -@view_config(renderer='pyramid.tests.viewdecoratorapp.views:templates/foo.mak', - name='second') -def second(request): - return {'result':'OK2'} - diff --git a/pyramid/tests/wsgiapp2app/__init__.py b/pyramid/tests/wsgiapp2app/__init__.py deleted file mode 100644 index 0880556ef..000000000 --- a/pyramid/tests/wsgiapp2app/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -from pyramid.view import view_config -from pyramid.wsgi import wsgiapp2 - -@view_config(name='hello', renderer='string') -@wsgiapp2 -def hello(environ, start_response): - assert environ['PATH_INFO'] == '/' - assert environ['SCRIPT_NAME'] == '/hello' - response_headers = [('Content-Type', 'text/plain')] - start_response('200 OK', response_headers) - return ['Hello!'] - -def main(): - from pyramid.config import Configurator - c = Configurator() - c.scan() - return c -- cgit v1.2.3