Merge lp:~michael-sheldon/jokosher/string-exception-cleanup into lp:jokosher

Proposed by Michael Sheldon
Status: Merged
Merged at revision: 1105
Proposed branch: lp:~michael-sheldon/jokosher/string-exception-cleanup
Merge into: lp:jokosher
Diff against target: 27 lines (+2/-2)
2 files modified
Jokosher/Globals.py (+1/-1)
extensions/eggs/FreesoundSearch/src/freesound.py (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/jokosher/string-exception-cleanup
Reviewer Review Type Date Requested Status
Jokosher Code Pending
Review via email: mp+27218@code.launchpad.net

Description of the change

Fixes a couple of remaining string based exceptions (deprecated in python 2.5 and removed entirely in 2.6).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Jokosher/Globals.py'
2--- Jokosher/Globals.py 2009-04-05 06:42:43 +0000
3+++ Jokosher/Globals.py 2010-06-10 01:25:42 +0000
4@@ -424,7 +424,7 @@
5 try:
6 os.makedirs(new_dir)
7 except:
8- raise "Failed to create user config directory %s" % new_dir
9+ raise Exception("Failed to create user config directory %s" % new_dir)
10
11 if jokosher_dir_empty and os.path.isdir(old_dir) and os.path.isdir(new_dir):
12 CopyAllFiles(old_dir, new_dir)
13
14=== modified file 'extensions/FreesoundSearch-0.3-py2.6.egg'
15Binary files extensions/FreesoundSearch-0.3-py2.6.egg 2009-06-08 13:56:43 +0000 and extensions/FreesoundSearch-0.3-py2.6.egg 2010-06-10 01:25:42 +0000 differ
16=== modified file 'extensions/eggs/FreesoundSearch/src/freesound.py'
17--- extensions/eggs/FreesoundSearch/src/freesound.py 2009-05-28 13:14:19 +0000
18+++ extensions/eggs/FreesoundSearch/src/freesound.py 2010-06-10 01:25:42 +0000
19@@ -249,7 +249,7 @@
20 dom = minidom.parseString(data)
21
22 if dom.documentElement.nodeName != "freesound":
23- raise "Search failed"
24+ raise Exception("Search failed")
25
26 return [Sample(sample.getAttribute("id")) for sample in
27 dom.getElementsByTagName('sample')]

Subscribers

People subscribed via source and target branches