From 8bfa9a33b093f1aaa3288b7e75da54d97ef5eee5 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 1 Feb 2017 18:18:48 +0000 Subject: [PATCH 1/3] Updated requirements to Django 1.10 - Legacy-Id: 12778 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5e2737603..a210975fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ coverage>=4.0.1,!=4.0.2 #cssselect>=0.6.1 # for PyQuery decorator>=3.4.0 defusedxml>=0.4.1 # for TastyPie when ussing xml; not a declared dependency -Django>=1.9,<1.10 +Django>=1.10,<1.11 django-bootstrap3>=7.0 django-formtools>=1.0 # instead of django.contrib.formtools in 1.8 django-markup>=1.1 From b76227340016daa4488bdae36fa24eb55fc36d7e Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 10 Feb 2017 11:00:38 +0000 Subject: [PATCH 2/3] Removed some old warning filters (OBE) - Legacy-Id: 12810 --- ietf/settings.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ietf/settings.py b/ietf/settings.py index cc5ee4ca1..49853f295 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -13,13 +13,9 @@ warnings.simplefilter("always", DeprecationWarning) warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report") warnings.filterwarnings("ignore", message="initial_data fixtures are deprecated. Use data migrations instead.", module="django.core.management.commands.loaddata") warnings.filterwarnings("ignore", message="The popen2 module is deprecated. Use the subprocess module.", module="ietf.utils.pipe") -warnings.filterwarnings("ignore", message="Reversing by dotted path is deprecated") -warnings.filterwarnings("ignore", message=r"Support for string view arguments to url\(\) is deprecated and will be removed in Django 1.10") # This is triggered by the TimedeltaField, which we retain only for the sake # of old migrations: warnings.filterwarnings("ignore", message=r"SubfieldBase has been deprecated. Use Field.from_db_value instead.") -# Bootstrap3 library code: -warnings.filterwarnings("ignore", message=r"render\(\) must be called with a dict, not a Context", module="bootstrap3.utils") try: From deb8ab6dba1b5f7b0aabe7eff849106019df1797 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 10 Feb 2017 11:02:06 +0000 Subject: [PATCH 3/3] Changed the nomcom __getattr__ mixin manager so as to not interfere with django 1.10 internals. - Legacy-Id: 12811 --- ietf/nomcom/managers.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ietf/nomcom/managers.py b/ietf/nomcom/managers.py index 20f5e8ea0..74806959d 100644 --- a/ietf/nomcom/managers.py +++ b/ietf/nomcom/managers.py @@ -1,14 +1,17 @@ from django.db import models from django.db.models.query import QuerySet +import debug # pyflakes:ignore class MixinManager(object): def __getattr__(self, attr, *args): - try: - return getattr(self.__class__, attr, *args) - except AttributeError: - return getattr(self.get_queryset(), attr, *args) - + if attr.startswith('__'): + return getattr(self.__class__, attr, *args) + else: + try: + return getattr(self.__class__, attr, *args) + except AttributeError: + return getattr(self.get_queryset(), attr, *args) class NomineePositionQuerySet(QuerySet):