← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty-updates

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2013-09-06 11:59:43 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20130906115943-h3td0l7tp16mb9oc
Tags: 1:2013.2~b3-0ubuntu1
* New upstream release.
* debian/control: Minimum python-openstack-auth version >= 1.1.1.
* debian/control: Add python-troveclient.
* debian/static: Refresh static assets for 2013.2~b3.
* debian/patches: ubuntu_local_settings.patch -> ubuntu_settings.patch, also
  patch location of secret key in openstack_dashboard/settings.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py
18
18
#    License for the specific language governing permissions and limitations
19
19
#    under the License.
20
20
 
21
 
from django.conf.urls.defaults import patterns
22
 
from django.conf.urls.defaults import url
 
21
from django.conf.urls.defaults import patterns  # noqa
 
22
from django.conf.urls.defaults import url  # noqa
23
23
 
24
24
from openstack_dashboard.dashboards.project.access_and_security.\
25
 
    api_access.views import download_ec2_bundle
26
 
from openstack_dashboard.dashboards.project.access_and_security.\
27
 
    api_access.views import download_rc_file
 
25
    api_access import views
28
26
 
29
27
 
30
28
urlpatterns = patterns('',
31
 
    url(r'^ec2/$', download_ec2_bundle, name='ec2'),
32
 
    url(r'^openrc/$', download_rc_file, name='openrc'),
 
29
    url(r'^ec2/$', views.download_ec2_bundle, name='ec2'),
 
30
    url(r'^openrc/$', views.download_rc_file, name='openrc'),
33
31
)