mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	Refs #23919 -- Removed enum ImportError handling for Python 2.
This commit is contained in:
		| @@ -2,6 +2,7 @@ import builtins | ||||
| import collections | ||||
| import datetime | ||||
| import decimal | ||||
| import enum | ||||
| import functools | ||||
| import math | ||||
| import types | ||||
| @@ -17,12 +18,6 @@ from django.utils.functional import LazyObject, Promise | ||||
| from django.utils.timezone import utc | ||||
| from django.utils.version import get_docs_version | ||||
|  | ||||
| try: | ||||
|     import enum | ||||
| except ImportError: | ||||
|     # No support on Python 2 if enum34 isn't installed. | ||||
|     enum = None | ||||
|  | ||||
|  | ||||
| class BaseSerializer: | ||||
|     def __init__(self, value): | ||||
| @@ -349,7 +344,7 @@ def serializer_factory(value): | ||||
|         return TupleSerializer(value) | ||||
|     if isinstance(value, dict): | ||||
|         return DictionarySerializer(value) | ||||
|     if enum and isinstance(value, enum.Enum): | ||||
|     if isinstance(value, enum.Enum): | ||||
|         return EnumSerializer(value) | ||||
|     if isinstance(value, datetime.datetime): | ||||
|         return DatetimeSerializer(value) | ||||
|   | ||||
| @@ -13,12 +13,6 @@ from django.utils.inspect import get_func_args | ||||
| from django.utils.module_loading import module_dir | ||||
| from django.utils.timezone import now | ||||
|  | ||||
| try: | ||||
|     import enum | ||||
| except ImportError: | ||||
|     # No support on Python 2 if enum34 isn't installed. | ||||
|     enum = None | ||||
|  | ||||
|  | ||||
| class SettingsReference(str): | ||||
|     """ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user