Backward-compatible Django 2.2 updates (part 2)

corehq/apps/dump_reload/tests/test_sql_dump_load.py

@@ -9,9 +9,6 @@
 from django.core import serializers
 from django.db.models.signals import post_delete, post_save
 from django.test import TestCase
-from django.test.utils import override_settings
-
-from nose.plugins.attrib import attr
 
 from casexml.apps.case.mock import CaseFactory, CaseIndex, CaseStructure
 
@@ -48,6 +45,7 @@
 from corehq.form_processor.tests.utils import (
     FormProcessorTestUtils,
     create_form_for_test,
+    use_sql_backend,
 )
 from corehq.messaging.scheduling.scheduling_partitioned.models import AlertScheduleInstance
 
@@ -140,8 +138,7 @@ def _check_signals_handle_raw(self, models):
                 self.assertIn('raw', args, message)
 
 
-@attr(sql_backend=True)
-@override_settings(TESTS_SHOULD_USE_SQL_BACKEND=True)
+@use_sql_backend
 class TestSQLDumpLoadShardedModels(BaseDumpLoadTest):
     maxDiff = None
 

corehq/ex-submodules/casexml/apps/case/tests/test_multimedia.py

@@ -358,5 +358,10 @@ def __init__(self, fileobj):
     def __getattr__(self, name):
         return getattr(self.fileobj, name)
 
+    def open(self, *args, **kw):
+        # compatible with django.core.files.base.File.open()
+        obj = self.fileobj.open(*args, **kw)
+        return self if obj is self.fileobj else obj
+
     def close(self):
         pass

corehq/form_processor/models.py

@@ -151,6 +151,7 @@ def open(self):
             return BytesIO(self.content)
         fileobj = self.raw_content.open()
 
+        # TODO remove when Django 1 is no longer supported
         if fileobj is None:
             assert not isinstance(self.raw_content, BlobMeta), repr(self)
             # work around Django 1.11 bug, fixed in 2.0

corehq/sql_db/config.py

@@ -111,8 +111,8 @@ def get_django_shard_map(self):
     def from_settings(cls):
         assert settings.USE_PARTITIONED_DATABASE
         return (
-            PlProxyConfig.from_dict(settings.DATABASES) or
-            PlProxyConfig.from_legacy_dict(getattr(settings, 'PARTITION_DATABASE_CONFIG'))
+            PlProxyConfig.from_dict(settings.DATABASES)
+            or PlProxyConfig.from_legacy_dict(settings.PARTITION_DATABASE_CONFIG)
         )
 
     @classmethod

custom/icds_reports/tests/agg_tests/reports/test_awc_reports.py

@@ -39,6 +39,8 @@ def today(cls):
 
 
 class TestAWCReport(TestCase):
+    maxDiff = None
+
     def test_beneficiary_details_recorded_weight_none(self):
         data = get_beneficiary_details(
             case_id='6b234c5b-883c-4849-9dfd-b1571af8717b',