mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	Refs #33476 -- Reformatted code with Black.
This commit is contained in:
		
				
					committed by
					
						 Mariusz Felisiak
						Mariusz Felisiak
					
				
			
			
				
	
			
			
			
						parent
						
							f68fa8b45d
						
					
				
				
					commit
					9c19aff7c7
				
			| @@ -56,21 +56,25 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|     @staticmethod | ||||
|     def _get_pk_values(serial_str): | ||||
|         serial_list = json.loads(serial_str) | ||||
|         return [obj_dict['pk'] for obj_dict in serial_list] | ||||
|         return [obj_dict["pk"] for obj_dict in serial_list] | ||||
|  | ||||
|     @staticmethod | ||||
|     def _get_field_values(serial_str, field_name): | ||||
|         serial_list = json.loads(serial_str) | ||||
|         return [obj_dict['fields'][field_name] for obj_dict in serial_list if field_name in obj_dict['fields']] | ||||
|         return [ | ||||
|             obj_dict["fields"][field_name] | ||||
|             for obj_dict in serial_list | ||||
|             if field_name in obj_dict["fields"] | ||||
|         ] | ||||
|  | ||||
|     def test_indentation_whitespace(self): | ||||
|         s = serializers.json.Serializer() | ||||
|         json_data = s.serialize([Score(score=5.0), Score(score=6.0)], indent=2) | ||||
|         for line in json_data.splitlines(): | ||||
|             if re.search(r'.+,\s*$', line): | ||||
|             if re.search(r".+,\s*$", line): | ||||
|                 self.assertEqual(line, line.rstrip()) | ||||
|  | ||||
|     @isolate_apps('serializers') | ||||
|     @isolate_apps("serializers") | ||||
|     def test_custom_encoder(self): | ||||
|         class ScoreDecimal(models.Model): | ||||
|             score = models.DecimalField() | ||||
| @@ -106,8 +110,10 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|                 "team": "Team" | ||||
|             } | ||||
|         }]""" | ||||
|         with self.assertRaisesMessage(DeserializationError, "(serializers.player:pk=badpk)"): | ||||
|             list(serializers.deserialize('json', test_string)) | ||||
|         with self.assertRaisesMessage( | ||||
|             DeserializationError, "(serializers.player:pk=badpk)" | ||||
|         ): | ||||
|             list(serializers.deserialize("json", test_string)) | ||||
|  | ||||
|     def test_helpful_error_message_invalid_field(self): | ||||
|         """ | ||||
| @@ -125,7 +131,7 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|         }]""" | ||||
|         expected = "(serializers.player:pk=1) field_value was 'invalidint'" | ||||
|         with self.assertRaisesMessage(DeserializationError, expected): | ||||
|             list(serializers.deserialize('json', test_string)) | ||||
|             list(serializers.deserialize("json", test_string)) | ||||
|  | ||||
|     def test_helpful_error_message_for_foreign_keys(self): | ||||
|         """ | ||||
| @@ -146,7 +152,7 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|         key = ["doesnotexist", "metadata"] | ||||
|         expected = "(serializers.category:pk=1) field_value was '%r'" % key | ||||
|         with self.assertRaisesMessage(DeserializationError, expected): | ||||
|             list(serializers.deserialize('json', test_string)) | ||||
|             list(serializers.deserialize("json", test_string)) | ||||
|  | ||||
|     def test_helpful_error_message_for_many2many_non_natural(self): | ||||
|         """ | ||||
| @@ -176,7 +182,7 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|         }]""" | ||||
|         expected = "(serializers.article:pk=1) field_value was 'doesnotexist'" | ||||
|         with self.assertRaisesMessage(DeserializationError, expected): | ||||
|             list(serializers.deserialize('json', test_string)) | ||||
|             list(serializers.deserialize("json", test_string)) | ||||
|  | ||||
|     def test_helpful_error_message_for_many2many_natural1(self): | ||||
|         """ | ||||
| @@ -214,7 +220,7 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|         key = ["doesnotexist", "meta1"] | ||||
|         expected = "(serializers.article:pk=1) field_value was '%r'" % key | ||||
|         with self.assertRaisesMessage(DeserializationError, expected): | ||||
|             for obj in serializers.deserialize('json', test_string): | ||||
|             for obj in serializers.deserialize("json", test_string): | ||||
|                 obj.save() | ||||
|  | ||||
|     def test_helpful_error_message_for_many2many_natural2(self): | ||||
| @@ -249,7 +255,7 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|         }]""" | ||||
|         expected = "(serializers.article:pk=1) field_value was 'doesnotexist'" | ||||
|         with self.assertRaisesMessage(DeserializationError, expected): | ||||
|             for obj in serializers.deserialize('json', test_string, ignore=False): | ||||
|             for obj in serializers.deserialize("json", test_string, ignore=False): | ||||
|                 obj.save() | ||||
|  | ||||
|     def test_helpful_error_message_for_many2many_not_iterable(self): | ||||
| @@ -264,10 +270,12 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase): | ||||
|  | ||||
|         expected = "(serializers.m2mdata:pk=1) field_value was 'None'" | ||||
|         with self.assertRaisesMessage(DeserializationError, expected): | ||||
|             next(serializers.deserialize('json', test_string, ignore=False)) | ||||
|             next(serializers.deserialize("json", test_string, ignore=False)) | ||||
|  | ||||
|  | ||||
| class JsonSerializerTransactionTestCase(SerializersTransactionTestBase, TransactionTestCase): | ||||
| class JsonSerializerTransactionTestCase( | ||||
|     SerializersTransactionTestBase, TransactionTestCase | ||||
| ): | ||||
|     serializer_name = "json" | ||||
|     fwd_ref_str = """[ | ||||
|     { | ||||
| @@ -299,23 +307,23 @@ class JsonSerializerTransactionTestCase(SerializersTransactionTestBase, Transact | ||||
| class DjangoJSONEncoderTests(SimpleTestCase): | ||||
|     def test_lazy_string_encoding(self): | ||||
|         self.assertEqual( | ||||
|             json.dumps({'lang': gettext_lazy("French")}, cls=DjangoJSONEncoder), | ||||
|             '{"lang": "French"}' | ||||
|             json.dumps({"lang": gettext_lazy("French")}, cls=DjangoJSONEncoder), | ||||
|             '{"lang": "French"}', | ||||
|         ) | ||||
|         with override('fr'): | ||||
|         with override("fr"): | ||||
|             self.assertEqual( | ||||
|                 json.dumps({'lang': gettext_lazy("French")}, cls=DjangoJSONEncoder), | ||||
|                 '{"lang": "Fran\\u00e7ais"}' | ||||
|                 json.dumps({"lang": gettext_lazy("French")}, cls=DjangoJSONEncoder), | ||||
|                 '{"lang": "Fran\\u00e7ais"}', | ||||
|             ) | ||||
|  | ||||
|     def test_timedelta(self): | ||||
|         duration = datetime.timedelta(days=1, hours=2, seconds=3) | ||||
|         self.assertEqual( | ||||
|             json.dumps({'duration': duration}, cls=DjangoJSONEncoder), | ||||
|             '{"duration": "P1DT02H00M03S"}' | ||||
|             json.dumps({"duration": duration}, cls=DjangoJSONEncoder), | ||||
|             '{"duration": "P1DT02H00M03S"}', | ||||
|         ) | ||||
|         duration = datetime.timedelta(0) | ||||
|         self.assertEqual( | ||||
|             json.dumps({'duration': duration}, cls=DjangoJSONEncoder), | ||||
|             '{"duration": "P0DT00H00M00S"}' | ||||
|             json.dumps({"duration": duration}, cls=DjangoJSONEncoder), | ||||
|             '{"duration": "P0DT00H00M00S"}', | ||||
|         ) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user