summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorRongzeZhu <zrzhit@gmail.com>2012-08-17 11:00:19 +0800
committerRongzeZhu <zrzhit@gmail.com>2012-08-17 11:00:19 +0800
commitbb35ceb694cb6317d6a5ecf2cb5cee5b12dd86be (patch)
treea1f651962bc468e47c3e2934c7430dbd8459eea7 /openstack
parent6a22ea45edc0f0263731944f2ad0ffe15c8a9457 (diff)
downloadoslo-bb35ceb694cb6317d6a5ecf2cb5cee5b12dd86be.tar.gz
oslo-bb35ceb694cb6317d6a5ecf2cb5cee5b12dd86be.tar.xz
oslo-bb35ceb694cb6317d6a5ecf2cb5cee5b12dd86be.zip
Fix spelling typos
Fixes for: * openstack/common/excutils.py * openstack/common/timeutils.py Change-Id: Ic747de783e64fae00edf5af64d1a79a4edcf8412
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/excutils.py4
-rw-r--r--openstack/common/timeutils.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/openstack/common/excutils.py b/openstack/common/excutils.py
index 67c9fa9..5dd4830 100644
--- a/openstack/common/excutils.py
+++ b/openstack/common/excutils.py
@@ -30,14 +30,14 @@ def save_and_reraise_exception():
"""Save current exception, run some code and then re-raise.
In some cases the exception context can be cleared, resulting in None
- being attempted to be reraised after an exception handler is run. This
+ being attempted to be re-raised after an exception handler is run. This
can happen when eventlet switches greenthreads or when running an
exception handler, code raises and catches an exception. In both
cases the exception context will be cleared.
To work around this, we save the exception state, run handler code, and
then re-raise the original exception. If another exception occurs, the
- saved exception is logged and the new exception is reraised.
+ saved exception is logged and the new exception is re-raised.
"""
type_, value, tb = sys.exc_info()
try:
diff --git a/openstack/common/timeutils.py b/openstack/common/timeutils.py
index ae300e4..c4f6cf0 100644
--- a/openstack/common/timeutils.py
+++ b/openstack/common/timeutils.py
@@ -93,13 +93,13 @@ def set_time_override(override_time=datetime.datetime.utcnow()):
def advance_time_delta(timedelta):
- """Advance overriden time using a datetime.timedelta."""
+ """Advance overridden time using a datetime.timedelta."""
assert(not utcnow.override_time is None)
utcnow.override_time += timedelta
def advance_time_seconds(seconds):
- """Advance overriden time by seconds."""
+ """Advance overridden time by seconds."""
advance_time_delta(datetime.timedelta(0, seconds))