diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-10 19:53:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-10 19:53:59 +0000 |
| commit | 3245a70beea7a472dfbde606fcd99aaee3a1925c (patch) | |
| tree | d334e5f599d46db7979870777d2f0ccf312cf235 | |
| parent | 832ce92545611efee0fe39fd3e063a6379f8ba5b (diff) | |
| parent | 201a1092f8d278cb2b0d87198682a71df1ab4544 (diff) | |
| download | keystone-3245a70beea7a472dfbde606fcd99aaee3a1925c.tar.gz keystone-3245a70beea7a472dfbde606fcd99aaee3a1925c.tar.xz keystone-3245a70beea7a472dfbde606fcd99aaee3a1925c.zip | |
Merge "Cleanup PEP8 errors from Common"
| -rw-r--r-- | keystone/openstack/common/iniparser.py | 2 | ||||
| -rw-r--r-- | keystone/openstack/common/timeutils.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/keystone/openstack/common/iniparser.py b/keystone/openstack/common/iniparser.py index 24128444..9bf399f0 100644 --- a/keystone/openstack/common/iniparser.py +++ b/keystone/openstack/common/iniparser.py @@ -54,7 +54,7 @@ class BaseParser(object): value = value.strip() if ((value and value[0] == value[-1]) and - (value[0] == "\"" or value[0] == "'")): + (value[0] == "\"" or value[0] == "'")): value = value[1:-1] return key.strip(), [value] diff --git a/keystone/openstack/common/timeutils.py b/keystone/openstack/common/timeutils.py index c4f6cf04..858ad8e8 100644 --- a/keystone/openstack/common/timeutils.py +++ b/keystone/openstack/common/timeutils.py @@ -122,5 +122,6 @@ def marshall_now(now=None): def unmarshall_time(tyme): """Unmarshall a datetime dict.""" return datetime.datetime(day=tyme['day'], month=tyme['month'], - year=tyme['year'], hour=tyme['hour'], minute=tyme['minute'], - second=tyme['second'], microsecond=tyme['microsecond']) + year=tyme['year'], hour=tyme['hour'], + minute=tyme['minute'], second=tyme['second'], + microsecond=tyme['microsecond']) |