summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-20 06:28:18 +0000
committerGerrit Code Review <review@openstack.org>2012-08-20 06:28:18 +0000
commit07cd4bf43cd8f9360b8a26a6653c155f163c0bf7 (patch)
tree8ff4df07448b5a683296a100a9a00a9a88158f29 /openstack
parentcd1424a5543ce01b3bd13887f2d1e818b8c296d3 (diff)
parentbb35ceb694cb6317d6a5ecf2cb5cee5b12dd86be (diff)
downloadoslo-07cd4bf43cd8f9360b8a26a6653c155f163c0bf7.tar.gz
oslo-07cd4bf43cd8f9360b8a26a6653c155f163c0bf7.tar.xz
oslo-07cd4bf43cd8f9360b8a26a6653c155f163c0bf7.zip
Merge "Fix spelling typos"
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))