From 38bab185a99ea4468a7fd4dfc3ad0eefc7f8d728 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 13 Jul 2013 17:28:21 +0200 Subject: [PATCH] Remove Python2.4-specific code. --- plugins/Conditional/plugin.py | 17 ++--------------- plugins/Factoids/plugin.py | 5 +---- plugins/Factoids/test.py | 5 +---- plugins/Karma/plugin.py | 5 +---- plugins/Karma/test.py | 5 +---- plugins/MessageParser/plugin.py | 5 +---- plugins/MessageParser/test.py | 5 +---- plugins/MoobotFactoids/plugin.py | 5 +---- plugins/QuoteGrabs/plugin.py | 5 +---- src/conf.py | 2 -- 10 files changed, 10 insertions(+), 49 deletions(-) diff --git a/plugins/Conditional/plugin.py b/plugins/Conditional/plugin.py index 323efdc9e..9c7dc2148 100644 --- a/plugins/Conditional/plugin.py +++ b/plugins/Conditional/plugin.py @@ -46,19 +46,6 @@ except: _ = lambda x:x internationalizeDocstring = lambda x:x -# builtin any is overwritten by callbacks... and python2.4 doesn't have it -def _any(iterable): - for element in iterable: - if element: - return True - return False -# for consistency with above, and for python2.4 -def _all(iterable): - for element in iterable: - if not element: - return False - return True - class Conditional(callbacks.Plugin): """Add the help for "@plugin help Conditional" here @@ -98,7 +85,7 @@ class Conditional(callbacks.Plugin): Returns true if all conditions supplied evaluate to true. """ - if _all(conds): + if __builtins__.all(conds): irc.reply("true") else: irc.reply("false") @@ -110,7 +97,7 @@ class Conditional(callbacks.Plugin): Returns true if any one of conditions supplied evaluates to true. """ - if _any(conds): + if __builtins__.any(conds): irc.reply("true") else: irc.reply("false") diff --git a/plugins/Factoids/plugin.py b/plugins/Factoids/plugin.py index be86f530a..34d3e2f58 100644 --- a/plugins/Factoids/plugin.py +++ b/plugins/Factoids/plugin.py @@ -44,10 +44,7 @@ import supybot.httpserver as httpserver from supybot.i18n import PluginInternationalization, internationalizeDocstring _ = PluginInternationalization('Factoids') -try: - import sqlite3 -except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 +import sqlite3 import re from supybot.utils.seq import dameraulevenshtein diff --git a/plugins/Factoids/test.py b/plugins/Factoids/test.py index 5a5e759f5..71849ec5f 100644 --- a/plugins/Factoids/test.py +++ b/plugins/Factoids/test.py @@ -31,10 +31,7 @@ from supybot.test import * import supybot.conf as conf -try: - import sqlite3 -except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 +import sqlite3 class FactoidsTestCase(ChannelPluginTestCase): plugins = ('Factoids',) diff --git a/plugins/Karma/plugin.py b/plugins/Karma/plugin.py index 2da7575dc..42c03ac95 100644 --- a/plugins/Karma/plugin.py +++ b/plugins/Karma/plugin.py @@ -41,10 +41,7 @@ import supybot.callbacks as callbacks from supybot.i18n import PluginInternationalization, internationalizeDocstring _ = PluginInternationalization('Karma') -try: - import sqlite3 -except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 +import sqlite3 class SqliteKarmaDB(object): def __init__(self, filename): diff --git a/plugins/Karma/test.py b/plugins/Karma/test.py index dc02f7c3d..e1ed6bd70 100644 --- a/plugins/Karma/test.py +++ b/plugins/Karma/test.py @@ -29,10 +29,7 @@ from supybot.test import * -try: - import sqlite3 -except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 +import sqlite3 class KarmaTestCase(ChannelPluginTestCase): plugins = ('Karma',) diff --git a/plugins/MessageParser/plugin.py b/plugins/MessageParser/plugin.py index 83a51d4ee..e4cc8f3bd 100644 --- a/plugins/MessageParser/plugin.py +++ b/plugins/MessageParser/plugin.py @@ -58,10 +58,7 @@ except: #'plugin. Download it at ' \ #'' -try: - import sqlite3 -except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 +import sqlite3 # these are needed cuz we are overriding getdb import threading diff --git a/plugins/MessageParser/test.py b/plugins/MessageParser/test.py index 63c59e2f1..71b02194c 100644 --- a/plugins/MessageParser/test.py +++ b/plugins/MessageParser/test.py @@ -30,10 +30,7 @@ from supybot.test import * -try: - import sqlite3 -except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 +import sqlite3 class MessageParserTestCase(ChannelPluginTestCase): diff --git a/plugins/MoobotFactoids/plugin.py b/plugins/MoobotFactoids/plugin.py index 2d170cd28..0bb0a20cd 100755 --- a/plugins/MoobotFactoids/plugin.py +++ b/plugins/MoobotFactoids/plugin.py @@ -98,10 +98,7 @@ class SqliteMoobotDB(object): self.dbs.clear() def _getDb(self, channel): - try: - import sqlite3 - except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 + import sqlite3 if channel in self.dbs: return self.dbs[channel] diff --git a/plugins/QuoteGrabs/plugin.py b/plugins/QuoteGrabs/plugin.py index b5434b61e..0682d0177 100644 --- a/plugins/QuoteGrabs/plugin.py +++ b/plugins/QuoteGrabs/plugin.py @@ -43,10 +43,7 @@ import supybot.callbacks as callbacks from supybot.i18n import PluginInternationalization, internationalizeDocstring _ = PluginInternationalization('QuoteGrabs') -try: - import sqlite3 -except ImportError: - from pysqlite2 import dbapi2 as sqlite3 # for python2.4 +import sqlite3 import traceback diff --git a/src/conf.py b/src/conf.py index ce5ba9145..1121b1d4a 100644 --- a/src/conf.py +++ b/src/conf.py @@ -843,8 +843,6 @@ class Databases(registry.SpaceSeparatedListOfStrings): v.insert(0, 'sqlite') if 'sqlite3' in sys.modules: v.insert(0, 'sqlite3') - if 'pysqlite2' in sys.modules: # for python 2.4 - v.insert(0, 'sqlite3') return v def serialize(self):