[bitbake-devel] [PATCH 11/23] toaster: bring django-aggregate-if into the project
Alex DAMIAN
alexandru.damian at intel.com
Thu Jun 25 10:33:48 UTC 2015
From: Alexandru DAMIAN <alexandru.damian at intel.com>
We bring the django-aggregate-if module (with minor changes to import)
into the project.
Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
---
lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py | 2 +-
lib/toaster/toastermain/settings.py | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py b/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
index 4ea9e8c..d5f3427 100644
--- a/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
+++ b/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
@@ -10,7 +10,7 @@ This code was based on the work of others found on the internet:
4. https://groups.google.com/forum/?fromgroups=#!topic/django-users/vVprMpsAnPo
'''
from __future__ import unicode_literals
-import six
+from django.utils import six
import django
from django.db.models.aggregates import Aggregate as DjangoAggregate
from django.db.models.sql.aggregates import Aggregate as DjangoSqlAggregate
diff --git a/lib/toaster/toastermain/settings.py b/lib/toaster/toastermain/settings.py
index 141ad08..60e80de 100644
--- a/lib/toaster/toastermain/settings.py
+++ b/lib/toaster/toastermain/settings.py
@@ -393,3 +393,12 @@ class InvalidString(str):
"Undefined variable or unknown value for: \"%s\"" % other)
TEMPLATE_STRING_IF_INVALID = InvalidString("%s")
+
+import sys
+sys.path.append(
+ os.path.join(
+ os.path.join(
+ os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+ "contrib"),
+ "django-aggregate-if-master")
+ )
--
1.9.1
More information about the bitbake-devel
mailing list