From 18136f0905fb8e4045ffe1e290f2e517f0b2e0cb Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 27 Feb 2006 16:22:10 +0000 Subject: [PATCH] pygst.py.in: use 'raise StandardError' instead of 'assert' so that compiled code raise a noticeable exception. Original commit message from CVS: * pygst.py.in: use 'raise StandardError' instead of 'assert' so that compiled code raise a noticeable exception. Closes #332586 --- ChangeLog | 7 +++++++ pygst.py.in | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bb4d2e496..0316774cb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-27 Edward Hervey + + * pygst.py.in: + use 'raise StandardError' instead of 'assert' so that compiled code + raise a noticeable exception. + Closes #332586 + 2006-02-22 Joe Wreschnig reviewed by: Edward Hervey diff --git a/pygst.py.in b/pygst.py.in index 34690837b9..4ec1be732e 100644 --- a/pygst.py.in +++ b/pygst.py.in @@ -41,15 +41,15 @@ def require(version): global _pygst_required_version if _pygst_required_version != None: - assert _pygst_required_version == version, \ - "a different version of gst was already required" + if _pygst_required_version != version: + raise StandardError, "a different version of gst was already required" return - assert not sys.modules.has_key('gst'), \ - "pygst.require() must be called before importing gst" + if not sys.modules.has_key('gst'): + raise StandardError, "pygst.require() must be called before importing gst" - assert version == _pygst_version, \ - "Only version '%s' is available" % _pygst_version + if version != _pygst_version: + raise StandardError, "Only version '%s' is available" % _pygst_version # move the pygst path to the front while _pygst_dir in sys.path: