diff --git a/swift/common/middleware/tempurl.py b/swift/common/middleware/tempurl.py index dfa264bf43..b71df51c35 100644 --- a/swift/common/middleware/tempurl.py +++ b/swift/common/middleware/tempurl.py @@ -375,7 +375,7 @@ class TempURL(object): break if not is_valid_hmac: return self._invalid(env, start_response) - # disallowed headers prevent accidently allowing upload of a pointer + # disallowed headers prevent accidentally allowing upload of a pointer # to data that the PUT tempurl would not otherwise allow access for. # It should be safe to provide a GET tempurl for data that an # untrusted client just uploaded with a PUT tempurl. @@ -540,7 +540,7 @@ class TempURL(object): def _clean_disallowed_headers(self, env, start_response): """ - Validate the absense of disallowed headers for "unsafe" operations. + Validate the absence of disallowed headers for "unsafe" operations. :returns: None for safe operations or swob.HTTPBadResponse if the request includes disallowed headers. diff --git a/swift/common/storage_policy.py b/swift/common/storage_policy.py index 90fcedd661..52eb5a9d19 100755 --- a/swift/common/storage_policy.py +++ b/swift/common/storage_policy.py @@ -324,7 +324,7 @@ class BaseStoragePolicy(object): Removes an alias name from the storage policy. Shouldn't be called directly from the storage policy but instead through the storage policy collection class, so lookups by name resolve correctly. If - the name removed is the primary name then the next availiable alias + the name removed is the primary name then the next available alias will be adopted as the new primary name. :param name: a name assigned to the storage policy @@ -776,7 +776,7 @@ class StoragePolicyCollection(object): def remove_policy_alias(self, *aliases): """ Removes a name or names from a policy. If the name removed is the - primary name then the next availiable alias will be adopted + primary name then the next available alias will be adopted as the new primary name. :param *aliases: arbitrary number of existing policy names to remove. diff --git a/swift/common/utils.py b/swift/common/utils.py index 6dadca3264..831f651ff1 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -424,7 +424,7 @@ def get_log_line(req, res, trans_time, additional_info): :param trans_time: the time the request took to complete, a float. :param additional_info: a string to log at the end of the line - :returns: a properly formated line for logging. + :returns: a properly formatted line for logging. """ policy_index = get_policy_index(req.headers, res.headers) diff --git a/test/unit/obj/test_reconstructor.py b/test/unit/obj/test_reconstructor.py index 7baa1342af..a093a80213 100755 --- a/test/unit/obj/test_reconstructor.py +++ b/test/unit/obj/test_reconstructor.py @@ -221,7 +221,7 @@ class TestGlobalSetupObjectReconstructor(unittest.TestCase): def part_2(set): # this part is a handoff in our config (always) - # so lets do a set with indicies from different nodes + # so lets do a set with indices from different nodes if set == 0: return (local_id + 1) % 3 else: diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py index 232f0091b2..ef32f29b06 100755 --- a/test/unit/obj/test_server.py +++ b/test/unit/obj/test_server.py @@ -5558,7 +5558,7 @@ class TestObjectServer(unittest.TestCase): object-metadata (e.g. X-Backend-Obj-Content-Length) is generally expected tomatch the test_doc) :param finish_body: boolean, if true send "0\r\n\r\n" after test_doc - and wait for 100-continue before yeilding context + and wait for 100-continue before yielding context """ test_data = 'obj data' footer_meta = {