[packages/python-django] Version: 1.11.15, Python 3.7 compat fix
jajcus
jajcus at pld-linux.org
Wed Sep 26 09:15:46 CEST 2018
commit db994b0ecb77b9e8a1cb85cb1e176d5602482f84
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Wed Sep 26 09:15:25 2018 +0200
Version: 1.11.15, Python 3.7 compat fix
python-django.spec | 9 ++++++---
python3.7.patch | 26 ++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index d322bf3..91ee951 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -12,12 +12,13 @@ Summary(pl.UTF-8): Szkielet WWW dla perfekcjonistów z ograniczeniami czasowymi
Name: python-%{module}
# stay on LTS line
# https://www.djangoproject.com/download/#supported-versions
-Version: 1.11.13
-Release: 2
+Version: 1.11.15
+Release: 1
License: BSD
Group: Libraries/Python
Source0: https://www.djangoproject.com/m/releases/1.11/Django-%{version}.tar.gz
-# Source0-md5: ebdac613143ebdca911d5cef326fdc53
+# Source0-md5: 9c25bc2575a2cd357bcc5764f809d29d
+Patch0: python3.7.patch
URL: https://www.djangoproject.com/
%if %(locale -a | grep -q '^C\.utf8$'; echo $?)
BuildRequires: glibc-localedb-all
@@ -87,6 +88,8 @@ Dokumentacja do Django.
%prep
%setup -q -n Django-%{version}
+%patch0 -p1
+
%build
%if %{with python2}
%py_build
diff --git a/python3.7.patch b/python3.7.patch
new file mode 100644
index 0000000..db806ee
--- /dev/null
+++ b/python3.7.patch
@@ -0,0 +1,26 @@
+From 931c60c5216bd71bc11f489e00e063331cf21f40 Mon Sep 17 00:00:00 2001
+From: Tim Graham <timograham at gmail.com>
+Date: Fri, 17 Nov 2017 15:38:29 -0500
+Subject: [PATCH] Refs #28814 -- Fixed "SyntaxError: Generator expression must
+ be parenthesized" on Python 3.7.
+
+Due to https://bugs.python.org/issue32012.
+---
+ django/contrib/admin/widgets.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
+index b9d45a10eed4..dfb288642e6b 100644
+--- a/django/contrib/admin/widgets.py
++++ b/django/contrib/admin/widgets.py
+@@ -162,9 +162,7 @@ def get_context(self, name, value, attrs):
+
+ params = self.url_parameters()
+ if params:
+- related_url += '?' + '&'.join(
+- '%s=%s' % (k, v) for k, v in params.items(),
+- )
++ related_url += '?' + '&'.join('%s=%s' % (k, v) for k, v in params.items())
+ context['related_url'] = mark_safe(related_url)
+ context['link_title'] = _('Lookup')
+ # The JavaScript code looks for this class.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-django.git/commitdiff/db994b0ecb77b9e8a1cb85cb1e176d5602482f84
More information about the pld-cvs-commit
mailing list