From c17f85e51b1c2fdd4a36f9f63036fa7bda582835 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 19 Nov 2003 22:36:58 +0000 Subject: [PATCH] Fixed escaping IOError from add command. --- plugins/Lookup.py | 4 ++-- test/test_Lookup.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/Lookup.py b/plugins/Lookup.py index a67049b93..9bcec54cc 100644 --- a/plugins/Lookup.py +++ b/plugins/Lookup.py @@ -130,8 +130,8 @@ class Lookup(callbacks.Privmsg): try: filename = os.path.join(conf.dataDir, filename) fd = file(filename) - except OSError, e: - irc.error('Could open %s: %s' % (filename, e)) + except EnvironmentError, e: + irc.error('Could not open %s: %s' % (filename, e)) return cursor.execute("""CREATE TABLE %s (key TEXT, value TEXT)""" % name) sql = """INSERT INTO %s VALUES (%%s, %%s)""" % name diff --git a/test/test_Lookup.py b/test/test_Lookup.py index 357e9cf8f..8744b64b1 100644 --- a/test/test_Lookup.py +++ b/test/test_Lookup.py @@ -33,6 +33,11 @@ from test import * import os +try: + import sqlite +except ImportError: + sqlite = None + import conf class LookupTestCase(PluginTestCase, PluginDocumentation): @@ -64,6 +69,9 @@ class LookupTestCase(PluginTestCase, PluginDocumentation): self.assertError('test foo') finally: conf.replyWhenNotCommand = original + + def testNotEscapingIOError(self): + self.assertNotRegexp('lookup add foo asdlfkjsdalfkj', 'IOError')