From b6bef41b8eae84a42b31414424b3d4fd1d999fe6 Mon Sep 17 00:00:00 2001 From: AK1N Nemesis Fixx Date: Fri, 23 Mar 2018 13:06:49 +0000 Subject: [PATCH 1/6] apply a fix, to intro compat with Django==1.11.11 --- singleton_models/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/singleton_models/admin.py b/singleton_models/admin.py index 508da1d..02bd27c 100644 --- a/singleton_models/admin.py +++ b/singleton_models/admin.py @@ -21,16 +21,16 @@ def get_urls(self): try: from django.conf.urls.defaults import patterns, url except ImportError: - from django.conf.urls import patterns, url + from django.conf.urls import url def wrap(view): def wrapper(*args, **kwargs): return self.admin_site.admin_view(view)(*args, **kwargs) return update_wrapper(wrapper, view) - info = self.model._meta.app_label, self.model._meta.module_name + info = self.model._meta.app_label, self.model._meta.model_name - urlpatterns = patterns('', + urlpatterns = [ url(r'^history/$', wrap(self.history_view), {'object_id': '1'}, @@ -39,7 +39,7 @@ def wrapper(*args, **kwargs): wrap(self.change_view), {'object_id': '1'}, name='%s_%s_changelist' % info), - ) + ] return urlpatterns def response_change(self, request, obj): From 0bbba042c41ab00af07b27cfc7f31d3e82da28e7 Mon Sep 17 00:00:00 2001 From: AK1N Nemesis Fixx Date: Fri, 23 Mar 2018 13:07:08 +0000 Subject: [PATCH 2/6] up the README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4e3b756..4258288 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +This version is merely a fixx to create compartibility with nu versions of Django (starting with Django==1.11.11) +--- # django-singleton From 30d8913be00871cbd8d8cde8968f30cee394212c Mon Sep 17 00:00:00 2001 From: AK1N Nemesis Fixx Date: Fri, 23 Mar 2018 13:09:21 +0000 Subject: [PATCH 3/6] fix the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4258288..19e958e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -This version is merely a fixx to create compartibility with nu versions of Django (starting with Django==1.11.11) +This version is merely a fixx to create compatibility with nu versions of Django (starting with Django==1.11.11) --- # django-singleton From 8da20d76a9b03e1971d03f2da140602dc553a423 Mon Sep 17 00:00:00 2001 From: "Ow. Nemesis Fixx" Date: Sun, 23 Jun 2019 15:30:31 +0300 Subject: [PATCH 4/6] switch to providing our own force_unicode --- singleton_models/admin.py | 2 +- singleton_models/compat.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 singleton_models/compat.py diff --git a/singleton_models/admin.py b/singleton_models/admin.py index 02bd27c..a28fe58 100644 --- a/singleton_models/admin.py +++ b/singleton_models/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django.utils.translation import ugettext as _ -from django.utils.encoding import force_unicode +from . compat import force_unicode from django.http import HttpResponseRedirect from functools import update_wrapper diff --git a/singleton_models/compat.py b/singleton_models/compat.py new file mode 100644 index 0000000..b57add2 --- /dev/null +++ b/singleton_models/compat.py @@ -0,0 +1,9 @@ +from django.utils import encoding + +# ugly hack required for Python 2/3 compat +if hasattr(encoding, 'force_unicode'): + force_unicode = encoding.force_unicode +elif hasattr(encoding, 'force_text'): + force_unicode = encoding.force_text +else: + force_unicode = lambda x: x From 03978d399ea4a2c3ff928755d806480aac653c83 Mon Sep 17 00:00:00 2001 From: "Ow. Nemesis Fixx" Date: Sun, 23 Jun 2019 15:35:02 +0300 Subject: [PATCH 5/6] Let's create a new package --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 6f5d70f..5308154 100755 --- a/setup.py +++ b/setup.py @@ -3,11 +3,11 @@ from setuptools import setup, find_packages setup(name='django-singleton', - version='0.1.9', - description='Reusable singleton models for Django', - author='Chris Davis', - author_email='defbyte@gmail.com', - url='https://github.com/defbyte/django-singleton', + version='0.2.0', + description='Reusable singleton models for Django (originally by Chris Davis)', + author='Nemesis Fixx', + author_email='joewillrich@gmail.com', + url='https://github.com/NuChwezi/django-singleton', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -20,4 +20,4 @@ 'Programming Language :: Python', 'Framework :: Django', ] -) \ No newline at end of file +) From 7644a87f89eaa4d9265ee305dcac2902f04d7037 Mon Sep 17 00:00:00 2001 From: "J. Hacker Lu" Date: Tue, 16 Jul 2019 15:08:37 +0000 Subject: [PATCH 6/6] fix bug where QueryDict doesnt have the has_key() method --- singleton_models/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/singleton_models/admin.py b/singleton_models/admin.py index a28fe58..98679cc 100644 --- a/singleton_models/admin.py +++ b/singleton_models/admin.py @@ -49,7 +49,7 @@ def response_change(self, request, obj): opts = obj._meta msg = _('%(obj)s was changed successfully.') % {'obj': force_unicode(obj)} - if request.POST.has_key("_continue"): + if "_continue" in request.POST: self.message_user(request, msg + ' ' + _("You may edit it again below.")) return HttpResponseRedirect(request.path) else: