catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Merge pull request #1209 from JackDanger/jack/store-as-python"

Browse source 
This reverts commit 2a3fdf6b64, reversing
changes made to a06145d781.
This commit is contained in:
Jack Danger 2017-09-27 13:57:40 -07:00
commit 53d8d48e88
5 changed files with 4 additions and 2178 deletions
Download patch file Download diff file Expand all files Collapse all files

3
moto/ec2/models.py
View file

@ -67,7 +67,6 @@ from .exceptions import (
MotoNotImplementedError,
FilterNotImplementedError
)
from .resources.instance_types import instance_types_data
from .utils import (
EC2_RESOURCE_TO_PREFIX,
EC2_PREFIX_TO_RESOURCE,
@ -113,7 +112,7 @@ from .utils import (
)
RESOURCES_DIR = os.path.join(os.path.dirname(__file__), 'resources')
INSTANCE_TYPES = json.loads(instance_types_data)
INSTANCE_TYPES = json.load(open(os.path.join(RESOURCES_DIR, 'instance_types.json'), 'r'))
def utc_date_and_time():

0
moto/ec2/resources/__init__.py
View file

1
moto/ec2/resources/instance_types.json Normal file
View file

File diff suppressed because one or more lines are too long

2164
moto/ec2/resources/instance_types.py
View file

File diff suppressed because it is too large Load diff