← Back to branch summary

~stefanor/ibid/hostmask

« back to all changes in this revision

Viewing changes to ibid/plugins/urlgrab.py

  • Committer: Tarmac
  • Author(s): Stefano Rivera
  • Date: 2012-07-31 10:40:47 UTC
  • mfrom: (1027.3.11 sqlalchemy-0.6-trunk)
  • Revision ID: tarmac-20120731104047-0mu0wrtedzd6mx5l
The massive SQLALchemy 0.6 + 0.7 patch. Only 18 months late :)
Main points:
* Use SQLALchemy 0.6 APIs, dropping 0.5 support.
* Create fullblown SQLAlchemy types for IbidUnicode(Text) rather than use TypeDecorator.
Author: Stefano Rivera
Merge Request: http://code.launchpad.net/~stefanor/ibid/sqlalchemy-0.6-trunk/+merge/66033
Approved by: Stefano Rivera, Max Rabkin, Jonathan Hitchcock, Keegan Carruthers-Smith
Fixes LP: #598379

Show diffs side-by-side

added added

removed removed

Lines of Context:
ibid/plugins/urlgrab.py
76
76
                url = 'http://%s' % url
77
77
 
78
78
        u = URL(url, event.channel, event.identity)
79
 
        event.session.save_or_update(u)
 
79
        event.session.add(u)
80
80
 
81
81
        if self.service and self.username:
82
82
            self._post_url(event, url)