[python-django-horizon/f20] Updated patches from f20-patches

[Matthias Runge]

commit 51fc7141afa30bae1663c913a7d90587f2691582
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri Jun 13 12:09:12 2014 +0200

    Updated patches from f20-patches

 0008-work-on-parallel-installable-django.patch |  167 ++++++++++++++++++++++--
 1 files changed, 156 insertions(+), 11 deletions(-)
---
diff --git a/0008-work-on-parallel-installable-django.patch b/0008-work-on-parallel-installable-django.patch
index e7111bb..84d4b06 100644
--- a/0008-work-on-parallel-installable-django.patch
+++ b/0008-work-on-parallel-installable-django.patch
@@ -1,31 +1,176 @@
-From 112f6ef55c15c69f88bb4dfbbd608ff00fba4a57 Mon Sep 17 00:00:00 2001
+From 0c5337e1fd8cf9a484caaa39475135105c581d55 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Thu, 12 Jun 2014 11:25:48 +0200
 Subject: [PATCH] work on parallel installable django
 
 ---
- manage.py                            | 7 +++++++
- openstack_dashboard/wsgi/django.wsgi | 7 +++++++
- 2 files changed, 14 insertions(+)
+ horizon/__init__.py                      | 4 ----
+ horizon/base.py                          | 4 ++++
+ horizon/conf/default.py                  | 3 +++
+ horizon/tables/views.py                  | 3 +++
+ horizon/test/helpers.py                  | 3 +++
+ manage.py                                | 4 ++++
+ openstack_dashboard/settings.py          | 3 +++
+ openstack_dashboard/test/helpers.py      | 3 +++
+ openstack_dashboard/test/settings.py     | 3 +++
+ openstack_dashboard/test/tests/quotas.py | 4 +++-
+ openstack_dashboard/usage/quotas.py      | 3 +++
+ openstack_dashboard/wsgi/django.wsgi     | 7 +++++++
+ 12 files changed, 39 insertions(+), 5 deletions(-)
 
+diff --git a/horizon/__init__.py b/horizon/__init__.py
+index 67a358e..b6fb54d 100644
+--- a/horizon/__init__.py
++++ b/horizon/__init__.py
+@@ -51,7 +51,3 @@ if Horizon:
+     get_dashboards = Horizon.get_dashboards
+     urls = Horizon._lazy_urls
+ 
+-# silence flake8 about unused imports here:
+-assert Dashboard
+-assert Panel
+-assert PanelGroup
+diff --git a/horizon/base.py b/horizon/base.py
+index 9318728..cdb73ed 100644
+--- a/horizon/base.py
++++ b/horizon/base.py
+@@ -28,6 +28,10 @@ import inspect
+ import logging
+ import os
+ 
++
++__requires__ = ['Django >= 1.5, < 1.6']
++import pkg_resources
++
+ from django.conf import settings  # noqa
+ from django.conf.urls.defaults import include  # noqa
+ from django.conf.urls.defaults import patterns  # noqa
+diff --git a/horizon/conf/default.py b/horizon/conf/default.py
+index 63ce6cf..1868181 100644
+--- a/horizon/conf/default.py
++++ b/horizon/conf/default.py
+@@ -1,3 +1,6 @@
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from django.conf import settings  # noqa
+ from django.utils.translation import ugettext_lazy as _  # noqa
+ 
+diff --git a/horizon/tables/views.py b/horizon/tables/views.py
+index d00b8f4..2eef998 100644
+--- a/horizon/tables/views.py
++++ b/horizon/tables/views.py
+@@ -16,6 +16,9 @@
+ 
+ from collections import defaultdict  # noqa
+ 
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from django.views import generic
+ 
+ from horizon.templatetags.horizon import has_permissions  # noqa
+diff --git a/horizon/test/helpers.py b/horizon/test/helpers.py
+index aff98d7..240ff92 100644
+--- a/horizon/test/helpers.py
++++ b/horizon/test/helpers.py
+@@ -22,6 +22,9 @@ import logging
+ import os
+ import socket
+ 
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from django.contrib.auth.middleware import AuthenticationMiddleware  # noqa
+ from django.contrib.auth.models import Permission  # noqa
+ from django.contrib.auth.models import User  # noqa
 diff --git a/manage.py b/manage.py
-index fe16377..eca9769 100755
+index fe16377..0c37053 100755
 --- a/manage.py
 +++ b/manage.py
-@@ -3,6 +3,13 @@
+@@ -3,6 +3,10 @@
  import os
  import sys
  
 +
-+####
-+# explicitly require Django 1.5 or later
-+from pkg_resources import require
-+require('Django>=1.5,<1.6')
-+####
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
 +
  from django.core.management import execute_from_command_line  # noqa
  
  if __name__ == "__main__":
+diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
+index cc40815..80fd87a 100644
+--- a/openstack_dashboard/settings.py
++++ b/openstack_dashboard/settings.py
+@@ -23,6 +23,9 @@ import os
+ import sys
+ import warnings
+ 
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from django.utils.translation import ugettext_lazy as _  # noqa
+ 
+ from openstack_dashboard import exceptions
+diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py
+index 42d93d9..2bba08f 100644
+--- a/openstack_dashboard/test/helpers.py
++++ b/openstack_dashboard/test/helpers.py
+@@ -21,6 +21,9 @@
+ from functools import wraps  # noqa
+ import os
+ 
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from django.conf import settings  # noqa
+ from django.contrib.auth.middleware import AuthenticationMiddleware  # noqa
+ from django.contrib.messages.storage import default_storage  # noqa
+diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py
+index 627f4f2..3bc8d89 100644
+--- a/openstack_dashboard/test/settings.py
++++ b/openstack_dashboard/test/settings.py
+@@ -1,5 +1,8 @@
+ import os
+ 
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from horizon.test.settings import *  # noqa
+ from horizon.utils import secret_key
+ 
+diff --git a/openstack_dashboard/test/tests/quotas.py b/openstack_dashboard/test/tests/quotas.py
+index c511248..023e1ef 100644
+--- a/openstack_dashboard/test/tests/quotas.py
++++ b/openstack_dashboard/test/tests/quotas.py
+@@ -18,9 +18,11 @@
+ #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+-
+ from __future__ import absolute_import
+ 
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from django import http
+ from mox import IsA  # noqa
+ 
+diff --git a/openstack_dashboard/usage/quotas.py b/openstack_dashboard/usage/quotas.py
+index de80c44..9fad691 100644
+--- a/openstack_dashboard/usage/quotas.py
++++ b/openstack_dashboard/usage/quotas.py
+@@ -2,6 +2,9 @@ from collections import defaultdict  # noqa
+ import itertools
+ import logging
+ 
++__requires__ = ['Django >= 1.5,< 1.6']
++import pkg_resources
++
+ from django.utils.translation import ugettext_lazy as _  # noqa
+ 
+ from horizon import exceptions
 diff --git a/openstack_dashboard/wsgi/django.wsgi b/openstack_dashboard/wsgi/django.wsgi
 index 1e92a4d..42430f7 100644
 --- a/openstack_dashboard/wsgi/django.wsgi