Move enum_extend_if_invalid to utils.py

This commit is contained in:
Mads Marquart
2018-12-12 23:06:16 +01:00
parent c57b84cd0b
commit b6a6d7dc68
2 changed files with 10 additions and 9 deletions

View File

@@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import json import json
import re import re
import aenum
from .models import * from .models import *
from .utils import * from .utils import *
@@ -24,14 +23,6 @@ class ConcatJSONDecoder(json.JSONDecoder):
return objs return objs
# End shameless copy # End shameless copy
def enum_extend_if_invalid(enumeration, value):
try:
return enumeration(value)
except ValueError:
log.warning("Failed parsing {}({!r}). Extending enum.".format(enumeration, value))
aenum.extend_enum(enumeration, "UNKNOWN_{}".format(value).upper(), value)
return enumeration(value)
def graphql_color_to_enum(color): def graphql_color_to_enum(color):
if color is None: if color is None:
return None return None

View File

@@ -11,6 +11,7 @@ from os.path import basename
import warnings import warnings
import logging import logging
import requests import requests
import aenum
from .models import * from .models import *
try: try:
@@ -297,3 +298,12 @@ def get_files_from_paths(filenames):
yield files yield files
for fn, fp, ft in files: for fn, fp, ft in files:
fp.close() fp.close()
def enum_extend_if_invalid(enumeration, value):
try:
return enumeration(value)
except ValueError:
log.warning("Failed parsing {}({!r}). Extending enum.".format(enumeration, value))
aenum.extend_enum(enumeration, "UNKNOWN_{}".format(value).upper(), value)
return enumeration(value)