Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite unnecessary importlib dependency in DynamoDB (#4035)

Browse Source
This commit is contained in:
Bert Blommers 2021-06-25 07:58:57 +01:00 committed by GitHub
parent 4778377e8e
commit 21a77510b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moto/dynamodb2/parsing/reserved_keywords.py
View File

@ -1,3 +1,7 @@
from moto.utilities.utils import load_resource
from pkg_resources import resource_filename
class ReservedKeywords(list): class ReservedKeywords(list):
""" """
DynamoDB has an extensive list of keywords. Keywords are considered when validating the expression Tree. DynamoDB has an extensive list of keywords. Keywords are considered when validating the expression Tree.
@ -18,12 +22,7 @@ class ReservedKeywords(list):
""" """
Get a list of reserved keywords of DynamoDB Get a list of reserved keywords of DynamoDB
""" """
try: reserved_keywords = load_resource(
import importlib.resources as pkg_resources resource_filename(__name__, "reserved_keywords.txt"), as_json=False
except ImportError:
import importlib_resources as pkg_resources
reserved_keywords = pkg_resources.read_text(
"moto.dynamodb2.parsing", "reserved_keywords.txt"
) )
return reserved_keywords.split() return reserved_keywords.split()

4
moto/utilities/utils.py
View File

@ -15,7 +15,7 @@ def random_string(length=None):
return random_str return random_str
def load_resource(filename): def load_resource(filename, as_json=True):
""" """
Open a file, and return the contents as JSON. Open a file, and return the contents as JSON.
Usage: Usage:
@ -23,4 +23,4 @@ def load_resource(filename):
load_resource(resource_filename(__name__, "resources/file.json")) load_resource(resource_filename(__name__, "resources/file.json"))
""" """
with open(filename, "r", encoding="utf-8") as f: with open(filename, "r", encoding="utf-8") as f:
return json.load(f) return json.load(f) if as_json else f.read()