ship impala license page (bug 675321)

apps/addons/urls.py

@@ -43,8 +43,6 @@
 
 impala_detail_patterns = patterns('',
     url('^$', views.impala_addon_detail, name='i_addons.detail'),
-    url('^license/(?P<version>[^/]+)?', views.impala_license,
-        name='i_addons.license'),
     url('^developers$', views.impala_developers, {'page': 'developers'},
         name='i_addons.meet'),
     url('^contribute/roadblock/', views.impala_developers,

apps/addons/views.py

@@ -770,25 +770,17 @@ def share(request, addon):
                           description=truncate(addon.summary, length=250))
 
 
-def _license(request, addon, version=None, template=None):
+@addon_view
+def license(request, addon, version=None):
     if version is not None:
         qs = addon.versions.filter(files__status__in=amo.VALID_STATUSES)
         version = get_list_or_404(qs, version=version)[0]
     else:
         version = addon.current_version
     if not (version and version.license):
-        raise http.Http404()
-    return jingo.render(request, template, dict(addon=addon, version=version))
-
-
-@addon_view
-def license(request, addon, version=None):
-    return _license(request, addon, version, 'addons/license.html')
-
-
-@addon_view
-def impala_license(request, addon, version=None):
-    return _license(request, addon, version, 'addons/impala/license.html')
+        raise http.Http404
+    return jingo.render(request, 'addons/impala/license.html',
+                        dict(addon=addon, version=version))
 
 
 def license_redirect(request, version):

apps/versions/models.py

@@ -142,8 +142,7 @@ def mirror_path_prefix(self):
         return os.path.join(settings.MIRROR_STAGE_PATH, str(self.addon_id))
 
     def license_url(self, impala=False):
-        u = '%saddons.license' % ('i_' if impala else '')
-        return reverse(u, args=[self.addon.slug, self.version])
+        return reverse('addons.license', args=[self.addon.slug, self.version])
 
     def flush_urls(self):
         return self.addon.flush_urls()