openstack
/
swift
Code Issues Proposed changes

Fix trivial typos 

Fixes a few typos I have stumbled across recently.

Change-Id: Ib232924f6b23c08578c52a8dd63aaaa8789f9da7
This commit is contained in:
anc 2014-07-07 12:32:44 +01:00
parent ee14d58d84
commit 6aff48c6f1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/utils.py
View File

@ -632,7 +632,7 @@ class Timestamp(object):
return INTERNAL_FORMAT % (self.timestamp, self.offset) return INTERNAL_FORMAT % (self.timestamp, self.offset)
def __str__(self): 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): def __float__(self):
return self.timestamp return self.timestamp

9
swift/container/backend.py
View File

@ -328,7 +328,7 @@ class ContainerBroker(DatabaseBroker):
:param content_type: object content-type :param content_type: object content-type
:param etag: object etag :param etag: object etag
:param deleted: if True, marks the object as deleted and sets the :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 :param storage_policy_index: the storage policy index for the object
""" """
record = {'name': name, 'created_at': timestamp, 'size': size, record = {'name': name, 'created_at': timestamp, 'size': size,
@ -582,7 +582,7 @@ class ContainerBroker(DatabaseBroker):
:param end_marker: end marker query :param end_marker: end marker query
:param prefix: prefix query :param prefix: prefix query
:param delimiter: delimiter for 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 the path
:returns: list of tuples of (name, created_at, size, content_type, :returns: list of tuples of (name, created_at, size, content_type,
@ -679,7 +679,7 @@ class ContainerBroker(DatabaseBroker):
break break
elif end > 0: elif end > 0:
marker = name[:end] + chr(ord(delimiter) + 1) 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 delim_force_gte = True
dir_name = name[:end + 1] dir_name = name[:end + 1]
if dir_name != orig_marker: if dir_name != orig_marker:
@ -696,7 +696,8 @@ class ContainerBroker(DatabaseBroker):
Merge items into the object table. Merge items into the object table.
:param item_list: list of dictionaries of {'name', 'created_at', :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 :param source: if defined, update incoming_sync with the source
""" """
def _really_merge_items(conn): def _really_merge_items(conn):

2
test/unit/common/ring/test_utils.py
View File

@ -149,7 +149,7 @@ class TestUtils(unittest.TestCase):
self.assertEquals(( self.assertEquals((
'container.builder', 'container.ring.gz' 'container.builder', 'container.ring.gz'
), parse_builder_ring_filename_args(args.split())) ), 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' args = 'swift-ring-builder test create'
self.assertEquals(( self.assertEquals((
'test', 'test.ring.gz' 'test', 'test.ring.gz'