From f6e91994f92a9ba6fe5ea6cb61a7b1f15d3b392f Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 23 Feb 2012 15:46:01 +0000 Subject: [PATCH] Fix exception name Fixes bug 939616 DataInvalid thrown by get_terminal_size is not a defined exception name Also added details to Authors Change-Id: Ia321d62d15b074aca69a5d0e5646966d7e297023 --- Authors | 1 + glance/common/animation.py | 2 +- glance/common/utils.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Authors b/Authors index 2c7a3c117b..8d096389df 100644 --- a/Authors +++ b/Authors @@ -10,6 +10,7 @@ Chuck Short Cory Wright Dan Prince Dean Troyer +Derek Higgins Donal Lafferty Eldar Nugaev Eoghan Glynn diff --git a/glance/common/animation.py b/glance/common/animation.py index 0dd82fc645..0a6ed62fac 100644 --- a/glance/common/animation.py +++ b/glance/common/animation.py @@ -116,7 +116,7 @@ def render(self): sys.stdout.write(bar + padding + rate + eta) sys.stdout.flush() - except (exception.DataInvalid, NotImplementedError): + except (exception.Invalid, NotImplementedError): sys.stdout.write("\b" * 6) # use the len of [%3d%%] percent = (str_percent + ' ' diff --git a/glance/common/utils.py b/glance/common/utils.py index 0e4a01329f..cbcbf7159a 100644 --- a/glance/common/utils.py +++ b/glance/common/utils.py @@ -363,10 +363,10 @@ def _get_terminal_size_unknownOS(): height_width = func.get(platform.os.name, _get_terminal_size_unknownOS)() if height_width == None: - raise exception.DataInvalid() + raise exception.Invalid() for i in height_width: if not isinstance(i, int) or i <= 0: - raise exception.DataInvalid() + raise exception.Invalid() return height_width[0], height_width[1]