summaryrefslogtreecommitdiffstats
path: root/keystone/tests/test_s3_token_middleware.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-08-16 04:52:21 +0000
committerGerrit Code Review <review@openstack.org>2013-08-16 04:52:21 +0000
commitd695d4a3cd747ba47e2dfa1ca7e688175cbd06be (patch)
tree265ebe221e20cec12973a0009422d90e96df8cef /keystone/tests/test_s3_token_middleware.py
parent6d174d8e301ee31d06f2406767fcfb08d65a21f7 (diff)
parentfa95c8bdc2e17b54ef6ff69e2e23b1faeb6a112a (diff)
downloadkeystone-d695d4a3cd747ba47e2dfa1ca7e688175cbd06be.tar.gz
keystone-d695d4a3cd747ba47e2dfa1ca7e688175cbd06be.tar.xz
keystone-d695d4a3cd747ba47e2dfa1ca7e688175cbd06be.zip
Merge "Clean hacking errors in advance of hacking update"
Diffstat (limited to 'keystone/tests/test_s3_token_middleware.py')
-rw-r--r--keystone/tests/test_s3_token_middleware.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/tests/test_s3_token_middleware.py b/keystone/tests/test_s3_token_middleware.py
index ec31f2ac..2d561c10 100644
--- a/keystone/tests/test_s3_token_middleware.py
+++ b/keystone/tests/test_s3_token_middleware.py
@@ -225,9 +225,9 @@ class S3TokenMiddlewareTestUtil(unittest.TestCase):
def test_split_path_invalid_path(self):
try:
s3_token.split_path('o\nn e', 2)
- except ValueError, err:
+ except ValueError as err:
self.assertEquals(str(err), 'Invalid path: o%0An%20e')
try:
s3_token.split_path('o\nn e', 2, 3, True)
- except ValueError, err:
+ except ValueError as err:
self.assertEquals(str(err), 'Invalid path: o%0An%20e')