← Back to branch summary

~ubuntu-branches/debian/sid/sqlalchemy/sid

« back to all changes in this revision

Viewing changes to lib/sqlalchemy/orm/persistence.py

  • Committer: Package Import Robot
  • Author(s): Piotr Ożarowski
  • Date: 2014-06-27 20:17:13 UTC
  • mfrom: (1.4.28)
  • Revision ID: package-import@ubuntu.com-20140627201713-g6p1kq8q1qenztrv
Tags: 0.9.6-1
http://bugs.debian.org/747852
http://bugs.debian.org/752145
* New upstream release
* Remove Python 3.X build tag files, thanks to Matthias Urlichs for the
  patch (closes: #747852)
* python-fdb isn't in the Debian archive yet so default dialect for firebird://
  URLs is changed to obsolete kinterbasdb, thanks to Russell Stuart for the
  patch (closes: #752145)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/sqlalchemy/orm/persistence.py
385
385
                    if value is None:
386
386
                        hasnull = True
387
387
                    params[col._label] = value
 
388
 
 
389
                # see #3060.   Need to consider an "unchanged" None
 
390
                # as potentially history for now.
 
391
                elif row_switch and history.unchanged == [None]:
 
392
                    params[col.key] = None
 
393
                    hasdata = True
388
394
        if hasdata:
389
395
            if hasnull:
390
396
                raise orm_exc.FlushError(