← Back to branch summary

~ubuntuone-pqm-team/gargoyle/stable

« back to all changes in this revision

Viewing changes to gargoyle/nexus_modules.py

  • Committer: Matias Bordese
  • Date: 2014-08-26 15:43:23 UTC
  • mfrom: (266.1.1 gargoyle)
  • Revision ID: matias.bordese@canonical.com-20140826154323-gvi87bj2lzvi1fz9
Merged Gargoyle 0.10.10 from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gargoyle/nexus_modules.py
79
79
        return 'Gargoyle'
80
80
 
81
81
    def get_urls(self):
82
 
        from django.conf.urls.defaults import patterns, url
 
82
        try:
 
83
            from django.conf.urls import patterns, url
 
84
        except ImportError:  # Django<=1.4
 
85
            from django.conf.urls.defaults import patterns, url
83
86
 
84
87
        urlpatterns = patterns('',
85
88
                               url(r'^add/$', self.as_view(self.add), name='add'),