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

Support Python 3 using six

Browse source
This commit is contained in:
David Baumgold 2014-08-26 13:25:50 -04:00
commit eedb4c4b73
67 changed files with 455 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

58
moto/dynamodb2/models.py
View file

@ -77,7 +77,7 @@ class Item(object):
self.range_key_type = range_key_type
self.attrs = {}
for key, value in attrs.iteritems():
for key, value in attrs.items():
self.attrs[key] = DynamoType(value)
def __repr__(self):
@ -85,7 +85,7 @@ class Item(object):
def to_json(self):
attributes = {}
for attribute_key, attribute in self.attrs.iteritems():
for attribute_key, attribute in self.attrs.items():
attributes[attribute_key] = attribute.value
return {
@ -95,7 +95,7 @@ class Item(object):
def describe_attrs(self, attributes):
if attributes:
included = {}
for key, value in self.attrs.iteritems():
for key, value in self.attrs.items():
if key in attributes:
included[key] = value
else:
@ -129,32 +129,32 @@ class Table(object):
self.indexes = indexes
self.created_at = datetime.datetime.now()
self.items = defaultdict(dict)
@property
def describe(self):
results = {
'Table': {
'AttributeDefinitions': self.attr,
'ProvisionedThroughput': self.throughput,
'TableSizeBytes': 0,
'TableName': self.name,
'TableStatus': 'ACTIVE',
'KeySchema': self.schema,
'ItemCount': len(self),
'ProvisionedThroughput': self.throughput,
'TableSizeBytes': 0,
'TableName': self.name,
'TableStatus': 'ACTIVE',
'KeySchema': self.schema,
'ItemCount': len(self),
'CreationDateTime': unix_time(self.created_at)
}
}
return results
def __len__(self):
count = 0
for key, value in self.items.iteritems():
for key, value in self.items.items():
if self.has_range_key:
count += len(value)
else:
count += 1
return count
def put_item(self, item_attrs):
hash_value = DynamoType(item_attrs.get(self.hash_key_attr))
if self.has_range_key:
@ -169,14 +169,14 @@ class Table(object):
else:
self.items[hash_value] = item
return item
def __nonzero__(self):
return True
@property
def has_range_key(self):
return self.range_key_attr is not None
def get_item(self, hash_key, range_key):
if self.has_range_key and not range_key:
raise ValueError("Table has a range key, but no range key was passed into get_item")
@ -187,7 +187,7 @@ class Table(object):
return self.items[hash_key]
except KeyError:
return None
def delete_item(self, hash_key, range_key):
try:
if range_key:
@ -196,12 +196,12 @@ class Table(object):
return self.items.pop(hash_key)
except KeyError:
return None
def query(self, hash_key, range_comparison, range_objs):
results = []
last_page = True # Once pagination is implemented, change this
possible_results = [ item for item in list(self.all_items()) if item.hash_key == hash_key]
possible_results = [ item for item in list(self.all_items()) if item.hash_key == hash_key]
if range_comparison:
for result in possible_results:
if result.range_key.compare(range_comparison, range_objs):
@ -220,7 +220,7 @@ class Table(object):
yield item
else:
yield hash_set
def scan(self, filters):
results = []
scanned_count = 0
@ -229,7 +229,7 @@ class Table(object):
for result in self.all_items():
scanned_count += 1
passes_all_conditions = True
for attribute_name, (comparison_operator, comparison_objs) in filters.iteritems():
for attribute_name, (comparison_operator, comparison_objs) in filters.items():
attribute = result.attrs.get(attribute_name)
if attribute:
@ -248,7 +248,7 @@ class Table(object):
if passes_all_conditions:
results.append(result)
return results, scanned_count, last_page
class DynamoDBBackend(BaseBackend):
@ -273,18 +273,18 @@ class DynamoDBBackend(BaseBackend):
if not table:
return None
return table.put_item(item_attrs)
def get_table_keys_name(self, table_name):
table = self.tables.get(table_name)
if not table:
return None, None
else:
return table.hash_key_attr, table.range_key_attr
def get_keys_value(self, table, keys):
if not table.hash_key_attr in keys or (table.has_range_key and not table.range_key_attr in keys):
raise ValueError("Table has a range key, but no range key was passed into get_item")
hash_key = DynamoType(keys[table.hash_key_attr])
raise ValueError("Table has a range key, but no range key was passed into get_item")
hash_key = DynamoType(keys[table.hash_key_attr])
range_key = DynamoType(keys[table.range_key_attr]) if table.has_range_key else None
return hash_key,range_key
@ -304,19 +304,19 @@ class DynamoDBBackend(BaseBackend):
range_values = [DynamoType(range_value) for range_value in range_value_dicts]
return table.query(hash_key, range_comparison, range_values)
def scan(self, table_name, filters):
table = self.tables.get(table_name)
if not table:
return None, None, None
scan_filters = {}
for key, (comparison_operator, comparison_values) in filters.iteritems():
for key, (comparison_operator, comparison_values) in filters.items():
dynamo_types = [DynamoType(value) for value in comparison_values]
scan_filters[key] = (comparison_operator, dynamo_types)
return table.scan(scan_filters)
def delete_item(self, table_name, keys):
table = self.tables.get(table_name)
if not table:

44
moto/dynamodb2/responses.py
View file

@ -1,5 +1,6 @@
from __future__ import unicode_literals
import json
import six
from moto.core.responses import BaseResponse
from moto.core.utils import camelcase_to_underscores
@ -50,15 +51,16 @@ class DynamoHandler(BaseResponse):
return status, self.response_headers, dynamo_json_dump({'__type': type_})
def call_action(self):
if 'GetSessionToken' in self.body:
body = self.body.decode('utf-8')
if 'GetSessionToken' in body:
return 200, self.response_headers, sts_handler()
self.body = json.loads(self.body or '{}')
self.body = json.loads(body or '{}')
endpoint = self.get_endpoint_name(self.headers)
if endpoint:
endpoint = camelcase_to_underscores(endpoint)
response = getattr(self, endpoint)()
if isinstance(response, basestring):
if isinstance(response, six.string_types):
return 200, self.response_headers, response
else:
@ -73,10 +75,10 @@ class DynamoHandler(BaseResponse):
limit = body.get('Limit')
if body.get("ExclusiveStartTableName"):
last = body.get("ExclusiveStartTableName")
start = dynamodb_backend2.tables.keys().index(last) + 1
start = list(dynamodb_backend2.tables.keys()).index(last) + 1
else:
start = 0
all_tables = dynamodb_backend2.tables.keys()
all_tables = list(dynamodb_backend2.tables.keys())
if limit:
tables = all_tables[start:start + limit]
else:
@ -91,17 +93,17 @@ class DynamoHandler(BaseResponse):
#get the table name
table_name = body['TableName']
#get the throughput
throughput = body["ProvisionedThroughput"]
throughput = body["ProvisionedThroughput"]
#getting the schema
key_schema = body['KeySchema']
#getting attribute definition
attr = body["AttributeDefinitions"]
#getting the indexes
table = dynamodb_backend2.create_table(table_name,
schema = key_schema,
throughput = throughput,
table = dynamodb_backend2.create_table(table_name,
schema = key_schema,
throughput = throughput,
attr = attr)
return dynamo_json_dump(table.describe)
return dynamo_json_dump(table.describe)
def delete_table(self):
name = self.body['TableName']
@ -131,7 +133,7 @@ class DynamoHandler(BaseResponse):
name = self.body['TableName']
item = self.body['Item']
result = dynamodb_backend2.put_item(name, item)
if result:
item_dict = result.to_json()
item_dict['ConsumedCapacityUnits'] = 1
@ -143,10 +145,10 @@ class DynamoHandler(BaseResponse):
def batch_write_item(self):
table_batches = self.body['RequestItems']
for table_name, table_requests in table_batches.iteritems():
for table_name, table_requests in table_batches.items():
for table_request in table_requests:
request_type = table_request.keys()[0]
request = table_request.values()[0]
request_type = list(table_request.keys())[0]
request = list(table_request.values())[0]
if request_type == 'PutRequest':
item = request['Item']
dynamodb_backend2.put_item(table_name, item)
@ -187,15 +189,15 @@ class DynamoHandler(BaseResponse):
def batch_get_item(self):
table_batches = self.body['RequestItems']
results = {
results = {
"ConsumedCapacity":[],
"Responses": {
"Responses": {
},
"UnprocessedKeys": {
}
}
for table_name, table_request in table_batches.iteritems():
for table_name, table_request in table_batches.items():
items = []
keys = table_request['Keys']
attributes_to_get = table_request.get('AttributesToGet')
@ -217,7 +219,7 @@ class DynamoHandler(BaseResponse):
keys = self.body['KeyConditions']
hash_key_name, range_key_name = dynamodb_backend2.get_table_keys_name(name)
if hash_key_name is None:
er = "'com.amazonaws.dynamodb.v20120810#ResourceNotFoundException"
er = "'com.amazonaws.dynamodb.v20120810#ResourceNotFoundException"
return self.error(er)
hash_key = keys[hash_key_name]['AttributeValueList'][0]
if len(keys) == 1:
@ -225,7 +227,7 @@ class DynamoHandler(BaseResponse):
range_values = []
else:
if range_key_name == None:
er = "com.amazon.coral.validate#ValidationException"
er = "com.amazon.coral.validate#ValidationException"
return self.error(er)
else:
range_condition = keys[range_key_name]
@ -238,7 +240,7 @@ class DynamoHandler(BaseResponse):
items, last_page = dynamodb_backend2.query(name, hash_key, range_comparison, range_values)
if items is None:
er = 'com.amazonaws.dynamodb.v20111205#ResourceNotFoundException'
return self.error(er)
return self.error(er)
limit = self.body.get("Limit")
if limit:
@ -267,7 +269,7 @@ class DynamoHandler(BaseResponse):
filters = {}
scan_filters = self.body.get('ScanFilter', {})
for attribute_name, scan_filter in scan_filters.iteritems():
for attribute_name, scan_filter in scan_filters.items():
# Keys are attribute names. Values are tuples of (comparison, comparison_value)
comparison_operator = scan_filter["ComparisonOperator"]
comparison_values = scan_filter.get("AttributeValueList", [])