Merged django-1.10 work forward to 6.43.0

- Legacy-Id: 12812

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:
+        if  attr.startswith('__'):
-            return getattr(self.__class__, attr, *args)
+            return getattr(self.__class__, attr, *args)            
-        except AttributeError:
+        else:
-            return getattr(self.get_queryset(), attr, *args)
+            try:
-
+                return getattr(self.__class__, attr, *args)
+            except AttributeError:
+                return getattr(self.get_queryset(), attr, *args)
 
 class NomineePositionQuerySet(QuerySet):
 

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:

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-bcrypt>=0.9.2
 django-bootstrap3>=7.0
 django-formtools>=1.0		# instead of django.contrib.formtools in 1.8