From patchwork Tue Nov 29 20:02:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5387 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 E3F6B24017 for ; Tue, 29 Nov 2011 20:02: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 C9F99A18103 for ; Tue, 29 Nov 2011 20:02:16 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id h2so1539196laa.11 for ; Tue, 29 Nov 2011 12:02:16 -0800 (PST) Received: by 10.152.162.10 with SMTP id xw10mr32186114lab.12.1322596936710; Tue, 29 Nov 2011 12:02: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 h6cs20612lal; Tue, 29 Nov 2011 12:02:16 -0800 (PST) Received: by 10.227.59.204 with SMTP id m12mr14900190wbh.10.1322596934508; Tue, 29 Nov 2011 12:02:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id cz6si19057680wib.18.2011.11.29.12.02.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 12:02: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 1RVTsc-0006WV-56 for ; Tue, 29 Nov 2011 20:02:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 1A555E04BC for ; Tue, 29 Nov 2011 20:02:14 +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: 328 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 328: Eh, again remove mount points, ther are not needed in URLs Message-Id: <20111129200214.19830.19652.launchpad@ackee.canonical.com> Date: Tue, 29 Nov 2011 20:02:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14404"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 434d2e1a7993930ae0642c3bfee84c0bba629874 ------------------------------------------------------------ revno: 328 committer: Zygmunt Krynicki branch nick: lava-server timestamp: Tue 2011-11-29 20:46:42 +0100 message: Eh, again remove mount points, ther are not needed 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 15:16:46 +0000 +++ lava_server/urls.py 2011-11-29 19:46:42 +0000 @@ -34,38 +34,38 @@ # Root URL patterns urlpatterns = patterns( '', - url(r'^{mount_point}$'.format(mount_point=settings.MOUNT_POINT), + url(r'^$', index, name='lava.home'), - url(r'^{mount_point}me/$'.format(mount_point=settings.MOUNT_POINT), + url(r'^me/$', me, name='lava.me'), - url(r'^{mount_point}version/$'.format(mount_point=settings.MOUNT_POINT), + url(r'^version/$', version, name='lava.version_details'), - url(r'^{mount_point}accounts/'.format(mount_point=settings.MOUNT_POINT), + url(r'^accounts/', include('django.contrib.auth.urls')), - url(r'^{mount_point}admin/'.format(mount_point=settings.MOUNT_POINT), + url(r'^admin/', include(admin.site.urls)), - url(r'^{mount_point}openid/'.format(mount_point=settings.MOUNT_POINT), + url(r'^openid/', include('django_openid_auth.urls')), - url(r'^{mount_point}RPC2/'.format(mount_point=settings.MOUNT_POINT), + url(r'^RPC2/', 'linaro_django_xmlrpc.views.handler', name='lava.api_handler', kwargs={ 'mapper': loader.xmlrpc_mapper, 'help_view': 'lava.api_help'}), - url(r'^{mount_point}api/help/$'.format(mount_point=settings.MOUNT_POINT), + url(r'^api/help/$', 'linaro_django_xmlrpc.views.help', name='lava.api_help', kwargs={ 'mapper': loader.xmlrpc_mapper}), - url(r'^{mount_point}api/'.format(mount_point=settings.MOUNT_POINT), + url(r'^api/', include(api_urls.token_urlpatterns)), # XXX: This is not needed but without it linaro-django-xmlrpc tests fail - url(r'^{mount_point}api/'.format(mount_point=settings.MOUNT_POINT), + url(r'^api/', include(api_urls.default_mapper_urlpatterns)), - url(r'^{mount_point}utils/markitup/'.format(mount_point=settings.MOUNT_POINT), + url(r'^utils/markitup/', include('lava_markitup.urls')))