Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-19 08:59:27 +01:00
Code Issues Projects Releases Wiki Activity

Factoids & Karma & MessageParser & MoobotFactoids & QuoteGrabs: Fix Pypy3 support (without breaking Python 2 support).

Browse Source
This commit is contained in:
Valentin Lorentz 2014-08-05 11:18:38 +02:00
parent 907ede8035
commit 35bfd76852
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Factoids/plugin.py
View File

@ -29,6 +29,7 @@
### ###
import os import os
import sys
import time import time
import string import string
import urllib import urllib
@ -217,10 +218,12 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
def makeDb(self, filename): def makeDb(self, filename):
if os.path.exists(filename): if os.path.exists(filename):
db = sqlite3.connect(filename) db = sqlite3.connect(filename)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
return db return db
db = sqlite3.connect(filename) db = sqlite3.connect(filename)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
cursor = db.cursor() cursor = db.cursor()
cursor.execute("""CREATE TABLE keys ( cursor.execute("""CREATE TABLE keys (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,

6
plugins/Karma/plugin.py
View File

@ -29,6 +29,7 @@
### ###
import os import os
import sys
import csv import csv
import supybot.conf as conf import supybot.conf as conf
@ -58,10 +59,13 @@ class SqliteKarmaDB(object):
return self.dbs[filename] return self.dbs[filename]
if os.path.exists(filename): if os.path.exists(filename):
db = sqlite3.connect(filename, check_same_thread=False) db = sqlite3.connect(filename, check_same_thread=False)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
self.dbs[filename] = db self.dbs[filename] = db
return db return db
db = sqlite3.connect(filename, check_same_thread=False) db = sqlite3.connect(filename, check_same_thread=False)
if sys.version_info[0] < 3:
db.text_factory = str
self.dbs[filename] = db self.dbs[filename] = db
cursor = db.cursor() cursor = db.cursor()
cursor.execute("""CREATE TABLE karma ( cursor.execute("""CREATE TABLE karma (

7
plugins/MessageParser/plugin.py
View File

@ -39,6 +39,7 @@ import supybot.ircdb as ircdb
import re import re
import os import os
import sys
import time import time
try: try:
@ -80,10 +81,12 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
"""Create the database and connect to it.""" """Create the database and connect to it."""
if os.path.exists(filename): if os.path.exists(filename):
db = sqlite3.connect(filename) db = sqlite3.connect(filename)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
return db return db
db = sqlite3.connect(filename) db = sqlite3.connect(filename)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
cursor = db.cursor() cursor = db.cursor()
cursor.execute("""CREATE TABLE triggers ( cursor.execute("""CREATE TABLE triggers (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,

7
plugins/MoobotFactoids/plugin.py
View File

@ -28,6 +28,7 @@
### ###
import os import os
import sys
import time import time
import string import string
@ -106,11 +107,13 @@ class SqliteMoobotDB(object):
if os.path.exists(filename): if os.path.exists(filename):
db = sqlite3.connect(filename, check_same_thread=False) db = sqlite3.connect(filename, check_same_thread=False)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
self.dbs[channel] = db self.dbs[channel] = db
return db return db
db = sqlite3.connect(filename, check_same_thread=False) db = sqlite3.connect(filename, check_same_thread=False)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
self.dbs[channel] = db self.dbs[channel] = db
cursor = db.cursor() cursor = db.cursor()
cursor.execute("""CREATE TABLE factoids ( cursor.execute("""CREATE TABLE factoids (

6
plugins/QuoteGrabs/plugin.py
View File

@ -82,12 +82,14 @@ class SqliteQuoteGrabsDB(object):
return self.dbs[filename] return self.dbs[filename]
if os.path.exists(filename): if os.path.exists(filename):
db = sqlite3.connect(filename) db = sqlite3.connect(filename)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
db.create_function('nickeq', 2, p) db.create_function('nickeq', 2, p)
self.dbs[filename] = db self.dbs[filename] = db
return db return db
db = sqlite3.connect(filename) db = sqlite3.connect(filename)
db.text_factory = str if sys.version_info[0] < 3:
db.text_factory = str
db.create_function('nickeq', 2, p) db.create_function('nickeq', 2, p)
self.dbs[filename] = db self.dbs[filename] = db
cursor = db.cursor() cursor = db.cursor()