From patchwork Mon Dec 5 23:17:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5492 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D73FE23E18 for ; Mon, 5 Dec 2011 23:17:16 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id B5027A18519 for ; Mon, 5 Dec 2011 23:17:16 +0000 (UTC) Received: by lagm6 with SMTP id m6so627287lag.11 for ; Mon, 05 Dec 2011 15:17:16 -0800 (PST) Received: by 10.152.104.206 with SMTP id gg14mr7434718lab.41.1323127036331; Mon, 05 Dec 2011 15:17:16 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs289645lal; Mon, 5 Dec 2011 15:17:15 -0800 (PST) Received: by 10.14.35.93 with SMTP id t69mr187162eea.206.1323127034348; Mon, 05 Dec 2011 15:17:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id o55si8128767eeb.23.2011.12.05.15.17.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Dec 2011 15:17:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RXhmb-0000mV-U6 for ; Mon, 05 Dec 2011 23:17:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D5FC4E0208 for ; Mon, 5 Dec 2011 23:17:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 332 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 332: Re-introduce mount points in URLs Message-Id: <20111205231713.29448.4363.launchpad@ackee.canonical.com> Date: Mon, 05 Dec 2011 23:17:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14435"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 5a6c65b90e49caba44c684d3ffc697e341c24859 ------------------------------------------------------------ revno: 332 committer: Zygmunt Krynicki branch nick: trunk timestamp: Tue 2011-12-06 00:14:55 +0100 message: Re-introduce mount points in URLs modified: lava_server/urls.py --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'lava_server/urls.py' --- lava_server/urls.py 2011-11-29 19:46:42 +0000 +++ lava_server/urls.py 2011-12-05 23:14:55 +0000 @@ -34,38 +34,38 @@ # Root URL patterns urlpatterns = patterns( '', - url(r'^$', + url(r'^{mount_point}$'.format(mount_point=settings.MOUNT_POINT), index, name='lava.home'), - url(r'^me/$', + url(r'^{mount_point}me/$'.format(mount_point=settings.MOUNT_POINT), me, name='lava.me'), - url(r'^version/$', + url(r'^{mount_point}version/$'.format(mount_point=settings.MOUNT_POINT), version, name='lava.version_details'), - url(r'^accounts/', + url(r'^{mount_point}accounts/'.format(mount_point=settings.MOUNT_POINT), include('django.contrib.auth.urls')), - url(r'^admin/', + url(r'^{mount_point}admin/'.format(mount_point=settings.MOUNT_POINT), include(admin.site.urls)), - url(r'^openid/', + url(r'^{mount_point}openid/'.format(mount_point=settings.MOUNT_POINT), include('django_openid_auth.urls')), - url(r'^RPC2/', + url(r'^{mount_point}RPC2/'.format(mount_point=settings.MOUNT_POINT), 'linaro_django_xmlrpc.views.handler', name='lava.api_handler', kwargs={ 'mapper': loader.xmlrpc_mapper, 'help_view': 'lava.api_help'}), - url(r'^api/help/$', + url(r'^{mount_point}api/help/$'.format(mount_point=settings.MOUNT_POINT), 'linaro_django_xmlrpc.views.help', name='lava.api_help', kwargs={ 'mapper': loader.xmlrpc_mapper}), - url(r'^api/', + url(r'^{mount_point}api/'.format(mount_point=settings.MOUNT_POINT), include(api_urls.token_urlpatterns)), # XXX: This is not needed but without it linaro-django-xmlrpc tests fail - url(r'^api/', + url(r'^{mount_point}api/'.format(mount_point=settings.MOUNT_POINT), include(api_urls.default_mapper_urlpatterns)), - url(r'^utils/markitup/', + url(r'^{mount_point}utils/markitup/'.format(mount_point=settings.MOUNT_POINT), include('lava_markitup.urls')))