summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2006-02-27 16:22:10 +0000
committerEdward Hervey <bilboed@bilboed.com>2006-02-27 16:22:10 +0000
commit18136f0905fb8e4045ffe1e290f2e517f0b2e0cb (patch)
tree6533727cfc002020d9570faabab2e384ba629071
parent37e88dd9f6ae758e5b43dfdec88211a8078dc2ef (diff)
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
-rw-r--r--ChangeLog7
-rw-r--r--pygst.py.in12
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7bb4d2e..0316774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-27 Edward Hervey <edward@fluendo.com>
+
+ * pygst.py.in:
+ use 'raise StandardError' instead of 'assert' so that compiled code
+ raise a noticeable exception.
+ Closes #332586
+
2006-02-22 Joe Wreschnig <piman@sacredchao.net>
reviewed by: Edward Hervey <edward@fluendo.com>
diff --git a/pygst.py.in b/pygst.py.in
index 3469083..4ec1be7 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: