[Python-apps-commits] r6697 - in packages/ibid/trunk/debian (3 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Wed Feb 23 23:25:12 UTC 2011
Date: Wednesday, February 23, 2011 @ 23:25:10
Author: stefanor
Revision: 6697
Refresh patches.
Modified:
packages/ibid/trunk/debian/changelog
packages/ibid/trunk/debian/patches/separate-data.diff
packages/ibid/trunk/debian/patches/sqlalchemy-0.6-support.patch
Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog 2011-02-23 23:09:33 UTC (rev 6696)
+++ packages/ibid/trunk/debian/changelog 2011-02-23 23:25:10 UTC (rev 6697)
@@ -1,4 +1,4 @@
-ibid (0.1.1+dfsg-1) UNRELEASED; urgency=low
+ibid (0.1.1+dfsg-1) unstable; urgency=low
* New upstream bug-fix release.
- Built documentation is included, removed in get-orig-source.
@@ -6,8 +6,9 @@
* Update debian/copyright format. youtube-dl is now public domain.
* Move mysqldb | psycopg2 to suggests, Ibid will use the stdlib sqlite3 by
default.
+ * Refresh patches.
- -- Stefano Rivera <stefanor at debian.org> Sat, 05 Feb 2011 12:35:27 +0200
+ -- Stefano Rivera <stefanor at debian.org> Thu, 24 Feb 2011 01:21:35 +0200
ibid (0.1.0+dfsg-3) experimental; urgency=low
Modified: packages/ibid/trunk/debian/patches/separate-data.diff
===================================================================
--- packages/ibid/trunk/debian/patches/separate-data.diff 2011-02-23 23:09:33 UTC (rev 6696)
+++ packages/ibid/trunk/debian/patches/separate-data.diff 2011-02-23 23:25:10 UTC (rev 6697)
@@ -26,15 +26,15 @@
include INSTALL
--- a/ibid/utils/__init__.py
+++ b/ibid/utils/__init__.py
-@@ -20,7 +20,6 @@
- from subprocess import Popen, PIPE
+@@ -21,7 +21,6 @@
+ import dateutil.parser
from dateutil.tz import tzlocal, tzutc
-from pkg_resources import resource_exists, resource_filename
import ibid
from ibid.compat import defaultdict, json
-@@ -268,9 +267,11 @@
+@@ -283,9 +282,11 @@
))
if os.path.exists(fspath):
return fspath
Modified: packages/ibid/trunk/debian/patches/sqlalchemy-0.6-support.patch
===================================================================
--- packages/ibid/trunk/debian/patches/sqlalchemy-0.6-support.patch 2011-02-23 23:09:33 UTC (rev 6696)
+++ packages/ibid/trunk/debian/patches/sqlalchemy-0.6-support.patch 2011-02-23 23:25:10 UTC (rev 6697)
@@ -6,7 +6,7 @@
Last-Update: 2010-06-17
--- a/ibid/core.py
+++ b/ibid/core.py
-@@ -329,28 +329,33 @@
+@@ -332,28 +332,33 @@
else:
if uri.startswith(u'mysql://'):
if u'?' not in uri:
@@ -53,14 +53,16 @@
def connect(self, dbapi_con, con_record):
--- a/ibid/db/__init__.py
+++ b/ibid/db/__init__.py
-@@ -19,7 +19,4 @@
+@@ -19,9 +19,6 @@
from ibid.db.versioned_schema import VersionedSchema, SchemaVersionException, \
schema_version_check, upgrade_schemas
-# We use SQLAlchemy 0.4 compatible .save_or_update() functions
-_warnings.filterwarnings('ignore', 'Use session.add\(\)', SADeprecationWarning)
-
- # vi: set et sta sw=4 ts=4:
+ def get_regexp_op(session):
+ "Return a regexp operator"
+ if session.bind.engine.name in ('postgres', 'postgresql'):
--- a/ibid/db/versioned_schema.py
+++ b/ibid/db/versioned_schema.py
@@ -4,8 +4,8 @@
@@ -123,8 +125,8 @@
event.addresponse(u'Done')
--- a/ibid/plugins/factoid.py
+++ b/ibid/plugins/factoid.py
-@@ -84,7 +84,7 @@
- .params(pattern='%\\_\\%%', escape='\\') \
+@@ -82,7 +82,7 @@
+ .filter(FactoidName.name.like('%#_#%%', escape='#')) \
.all():
row.wild = True
- self.upgrade_session.save_or_update(row)
@@ -132,7 +134,7 @@
def upgrade_7_to_8(self):
self.drop_index(self.table.c._name)
self.alter_column(Column('name',
-@@ -367,7 +367,7 @@
+@@ -394,7 +394,7 @@
name = FactoidName(unicode(target), event.identity)
factoid.names.append(name)
@@ -141,7 +143,7 @@
event.session.commit()
event.addresponse(True)
log.info(u"Added name '%s' to factoid %s (%s) by %s/%s (%s)",
-@@ -552,7 +552,7 @@
+@@ -590,7 +590,7 @@
factoid = Factoid()
fname = FactoidName(unicode(name), event.identity)
factoid.names.append(fname)
@@ -150,7 +152,7 @@
event.session.flush()
log.info(u"Creating factoid %s with name '%s' by %s", factoid.id, fname.name, event.identity)
-@@ -560,7 +560,7 @@
+@@ -598,7 +598,7 @@
value = '%s %s' % (verb, value)
fvalue = FactoidValue(unicode(value), event.identity)
factoid.values.append(fvalue)
@@ -159,7 +161,7 @@
event.session.commit()
self.last_set_factoid=factoid.names[0].name
log.info(u"Added value '%s' to factoid %s (%s) by %s/%s (%s)",
-@@ -614,7 +614,7 @@
+@@ -659,7 +659,7 @@
oldvalue = factoid[2].value
factoid[2].value += suffix
@@ -168,7 +170,7 @@
event.session.commit()
log.info(u"Appended '%s' to value %s of factoid %s (%s) by %s/%s (%s)",
-@@ -707,7 +707,7 @@
+@@ -752,7 +752,7 @@
event.addresponse(u"That operation makes no sense. Try something like y/abcdef/ABCDEF/")
return
@@ -179,7 +181,7 @@
log.info(u"Applying '%s' to value %s of factoid %s (%s) by %s/%s (%s)",
--- a/ibid/plugins/feeds.py
+++ b/ibid/plugins/feeds.py
-@@ -142,7 +142,7 @@
+@@ -143,7 +143,7 @@
return
feed = Feed(unicode(name), unicode(url), event.identity)
@@ -225,7 +227,7 @@
event.session.commit()
identify_cache.clear()
-@@ -182,12 +182,12 @@
+@@ -183,12 +183,12 @@
return
account = Account(username)
@@ -240,7 +242,7 @@
identify_cache.clear()
-@@ -249,7 +249,7 @@
+@@ -250,7 +250,7 @@
if not ident:
ident = Identity(source, identity)
ident.account_id = account.id
@@ -249,7 +251,7 @@
event.session.commit()
identify_cache.clear()
-@@ -275,7 +275,7 @@
+@@ -276,7 +276,7 @@
if not identity:
identity = Identity(source, user)
identity.account_id = account_id
@@ -258,7 +260,7 @@
identify_cache.clear()
del self.tokens[token]
-@@ -307,7 +307,7 @@
+@@ -308,7 +308,7 @@
event.addresponse(u"I don't know about that identity")
else:
identity.account_id = None
@@ -267,7 +269,7 @@
event.session.commit()
identify_cache.clear()
-@@ -343,7 +343,7 @@
+@@ -344,7 +344,7 @@
return
account.attributes.append(Attribute(name, value))
@@ -276,7 +278,7 @@
event.session.commit()
event.addresponse(True)
-@@ -466,7 +466,7 @@
+@@ -467,7 +467,7 @@
.first()
if not identity:
identity = Identity(event.source, event.sender['id'])
@@ -285,7 +287,7 @@
try:
event.session.commit()
log.info(u'Created identity %s for %s on %s', identity.id, identity.identity, identity.source)
-@@ -545,7 +545,7 @@
+@@ -546,7 +546,7 @@
credential = password
credential = Credential(method, credential, source, account.id)
@@ -294,7 +296,7 @@
event.session.commit()
log.info(u"Added %s credential %s for account %s (%s) on %s by account %s",
method, credential.credential, account.id, account.username, source, event.account)
-@@ -600,7 +600,7 @@
+@@ -601,7 +601,7 @@
return
permission.value = value
@@ -316,7 +318,7 @@
log.info(u"%s karma for '%s' by %s/%s (%s) because: %s",
--- a/ibid/plugins/memo.py
+++ b/ibid/plugins/memo.py
-@@ -114,7 +114,7 @@
+@@ -118,7 +118,7 @@
event.addresponse(u'I am not connected to %s', source)
return
to = Identity(source, who)
@@ -325,7 +327,7 @@
event.session.commit()
log.info(u"Created identity %s for %s on %s", to.id, to.identity,
-@@ -129,7 +129,7 @@
+@@ -133,7 +133,7 @@
memo = Memo(event.identity, to.id, memo,
how.lower() in (u'pm', u'privmsg', u'msg'))
@@ -334,7 +336,7 @@
event.session.commit()
log.info(u"Stored memo %s for %s (%s) from %s (%s): %s",
-@@ -280,7 +280,7 @@
+@@ -290,7 +290,7 @@
})
memo.delivered = True
@@ -387,7 +389,7 @@
print >> stderr, u'The following factoids already exist in the database. ' \
--- a/scripts/ibid-knab-import
+++ b/scripts/ibid-knab-import
-@@ -124,7 +124,7 @@
+@@ -130,7 +130,7 @@
if not identity:
identity = Identity(source, user)
identity.created = created
@@ -396,7 +398,7 @@
session.flush()
elif identity.created > created:
identity.created = created
-@@ -181,7 +181,7 @@
+@@ -187,7 +187,7 @@
fvalue.time = kfactoid.utc_time
factoid.values.append(fvalue)
@@ -405,7 +407,7 @@
ibid.commit()
-@@ -291,7 +291,7 @@
+@@ -297,7 +297,7 @@
config.merge(FileConfig('local.ini'))
ibidengine = create_engine(config.databases['ibid'], encoding='utf-8')
More information about the Python-apps-commits
mailing list