Fix trivial typos
Fixes a few typos I have stumbled across recently. Change-Id: Ib232924f6b23c08578c52a8dd63aaaa8789f9da7
This commit is contained in:
parent
ee14d58d84
commit
6aff48c6f1
@ -632,7 +632,7 @@ class Timestamp(object):
|
||||
return INTERNAL_FORMAT % (self.timestamp, self.offset)
|
||||
|
||||
def __str__(self):
|
||||
raise TypeError('You must specificy which string format is required')
|
||||
raise TypeError('You must specify which string format is required')
|
||||
|
||||
def __float__(self):
|
||||
return self.timestamp
|
||||
|
@ -328,7 +328,7 @@ class ContainerBroker(DatabaseBroker):
|
||||
:param content_type: object content-type
|
||||
:param etag: object etag
|
||||
:param deleted: if True, marks the object as deleted and sets the
|
||||
deteleted_at timestamp to timestamp
|
||||
deleted_at timestamp to timestamp
|
||||
:param storage_policy_index: the storage policy index for the object
|
||||
"""
|
||||
record = {'name': name, 'created_at': timestamp, 'size': size,
|
||||
@ -582,7 +582,7 @@ class ContainerBroker(DatabaseBroker):
|
||||
:param end_marker: end marker query
|
||||
:param prefix: prefix query
|
||||
:param delimiter: delimiter for query
|
||||
:param path: if defined, will set the prefix and delimter based on
|
||||
:param path: if defined, will set the prefix and delimiter based on
|
||||
the path
|
||||
|
||||
:returns: list of tuples of (name, created_at, size, content_type,
|
||||
@ -679,7 +679,7 @@ class ContainerBroker(DatabaseBroker):
|
||||
break
|
||||
elif end > 0:
|
||||
marker = name[:end] + chr(ord(delimiter) + 1)
|
||||
# we want result to be inclusinve of delim+1
|
||||
# we want result to be inclusive of delim+1
|
||||
delim_force_gte = True
|
||||
dir_name = name[:end + 1]
|
||||
if dir_name != orig_marker:
|
||||
@ -696,7 +696,8 @@ class ContainerBroker(DatabaseBroker):
|
||||
Merge items into the object table.
|
||||
|
||||
:param item_list: list of dictionaries of {'name', 'created_at',
|
||||
'size', 'content_type', 'etag', 'deleted'}
|
||||
'size', 'content_type', 'etag', 'deleted',
|
||||
'storage_policy_index'}
|
||||
:param source: if defined, update incoming_sync with the source
|
||||
"""
|
||||
def _really_merge_items(conn):
|
||||
|
@ -149,7 +149,7 @@ class TestUtils(unittest.TestCase):
|
||||
self.assertEquals((
|
||||
'container.builder', 'container.ring.gz'
|
||||
), parse_builder_ring_filename_args(args.split()))
|
||||
# builer name arg should always fall through
|
||||
# builder name arg should always fall through
|
||||
args = 'swift-ring-builder test create'
|
||||
self.assertEquals((
|
||||
'test', 'test.ring.gz'
|
||||
|
Loading…
x
Reference in New Issue
Block a user