[Python-modules-commits] [sqlobject] 09/15: merge patched into master

Neil Muller drnlmza-guest at moszumanska.debian.org
Wed Jun 29 15:11:07 UTC 2016


This is an automated email from the git hooks/post-receive script.

drnlmza-guest pushed a commit to branch master
in repository sqlobject.

commit e09f2d596d03151f6aea9e32735ff8537048564b
Merge: 6d7e60f a4bc9c6
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date:   Mon Jun 20 14:12:44 2016 +0200

    merge patched into master

 .travis.yml                                        |   34 +-
 MANIFEST.in                                        |    3 +-
 PKG-INFO                                           |   13 +-
 README.txt                                         |    4 +-
 SQLObject.egg-info/PKG-INFO                        |   13 +-
 SQLObject.egg-info/SOURCES.txt                     |   64 +-
 SQLObject.egg-info/requires.txt                    |    1 +
 debian/.git-dpm                                    |    6 +-
 .../0005-Remove-docs-from-installed-files.patch    |   16 +-
 debian/patches/change_doc_build_script             |    4 +-
 debian/patches/get_rid_of_setuptools               |    6 +-
 debian/patches/remove_pkg_resources                |   14 +-
 debian/patches/replace_sf_logo                     |   32 +-
 docs/Authors.txt                                   |    1 +
 docs/DeveloperGuide.txt                            |    8 +-
 docs/News.txt                                      |   27 +
 docs/Python3.txt                                   |   83 +
 docs/SQLBuilder.txt                                |    2 +-
 docs/SQLObject.txt                                 |   70 +-
 docs/TODO.txt                                      |   11 +-
 docs/community.txt                                 |    4 +-
 docs/html/Authors.html                             |    1 +
 docs/html/DeveloperGuide.html                      |    7 +-
 docs/html/News.html                                |  237 +-
 docs/html/Python3.html                             |  136 +
 docs/html/SQLBuilder.html                          |    2 +-
 docs/html/SQLObject.html                           |  254 +-
 docs/html/TODO.html                                |   16 +-
 ...s-sqlobject.boundattributes.BoundAttribute.html |   16 +-
 ...ass-sqlobject.boundattributes.BoundFactory.html |   28 +-
 docs/html/class-sqlobject.cache.CacheSet.html      |   32 +-
 ...lass-sqlobject.classregistry.ClassRegistry.html |   16 +-
 docs/html/class-sqlobject.col.BLOBCol.html         |   10 +-
 docs/html/class-sqlobject.col.BigIntCol.html       |   10 +-
 docs/html/class-sqlobject.col.BoolCol.html         |   10 +-
 docs/html/class-sqlobject.col.Col.html             |   10 +-
 docs/html/class-sqlobject.col.CurrencyCol.html     |   10 +-
 docs/html/class-sqlobject.col.DateCol.html         |   10 +-
 docs/html/class-sqlobject.col.DateTimeCol.html     |   12 +-
 docs/html/class-sqlobject.col.DecimalCol.html      |   10 +-
 .../html/class-sqlobject.col.DecimalStringCol.html |   10 +-
 docs/html/class-sqlobject.col.EnumCol.html         |   10 +-
 docs/html/class-sqlobject.col.FloatCol.html        |   10 +-
 docs/html/class-sqlobject.col.ForeignKey.html      |   10 +-
 docs/html/class-sqlobject.col.IntCol.html          |   10 +-
 docs/html/class-sqlobject.col.KeyCol.html          |   10 +-
 docs/html/class-sqlobject.col.MediumIntCol.html    |   10 +-
 docs/html/class-sqlobject.col.PickleCol.html       |   10 +-
 docs/html/class-sqlobject.col.SOBLOBCol.html       |   40 +-
 docs/html/class-sqlobject.col.SOBigIntCol.html     |   42 +-
 docs/html/class-sqlobject.col.SOBoolCol.html       |   42 +-
 docs/html/class-sqlobject.col.SOCol.html           |   42 +-
 docs/html/class-sqlobject.col.SOCurrencyCol.html   |   40 +-
 docs/html/class-sqlobject.col.SODateCol.html       |   43 +-
 docs/html/class-sqlobject.col.SODateTimeCol.html   |   40 +-
 docs/html/class-sqlobject.col.SODecimalCol.html    |   40 +-
 .../class-sqlobject.col.SODecimalStringCol.html    |   40 +-
 docs/html/class-sqlobject.col.SOEnumCol.html       |   40 +-
 docs/html/class-sqlobject.col.SOFloatCol.html      |   42 +-
 docs/html/class-sqlobject.col.SOForeignKey.html    |   50 +-
 docs/html/class-sqlobject.col.SOIntCol.html        |   42 +-
 docs/html/class-sqlobject.col.SOKeyCol.html        |   40 +-
 docs/html/class-sqlobject.col.SOMediumIntCol.html  |   42 +-
 docs/html/class-sqlobject.col.SOPickleCol.html     |   40 +-
 docs/html/class-sqlobject.col.SOSetCol.html        |   40 +-
 docs/html/class-sqlobject.col.SOSmallIntCol.html   |   42 +-
 docs/html/class-sqlobject.col.SOStringCol.html     |   40 +-
 docs/html/class-sqlobject.col.SOStringLikeCol.html |   40 +-
 docs/html/class-sqlobject.col.SOTimeCol.html       |   40 +-
 docs/html/class-sqlobject.col.SOTimedeltaCol.html  |   42 +-
 docs/html/class-sqlobject.col.SOTimestampCol.html  |   40 +-
 docs/html/class-sqlobject.col.SOTinyIntCol.html    |   42 +-
 docs/html/class-sqlobject.col.SOUnicodeCol.html    |   40 +-
 docs/html/class-sqlobject.col.SetCol.html          |   10 +-
 docs/html/class-sqlobject.col.SmallIntCol.html     |   10 +-
 docs/html/class-sqlobject.col.StringCol.html       |   10 +-
 docs/html/class-sqlobject.col.TimeCol.html         |   10 +-
 docs/html/class-sqlobject.col.TimedeltaCol.html    |   10 +-
 docs/html/class-sqlobject.col.TimestampCol.html    |   10 +-
 docs/html/class-sqlobject.col.TinyIntCol.html      |   10 +-
 docs/html/class-sqlobject.col.UnicodeCol.html      |   10 +-
 .../html/class-sqlobject.constraints.BadValue.html |    6 +-
 docs/html/class-sqlobject.constraints.InList.html  |    8 +-
 .../class-sqlobject.constraints.MaxLength.html     |    8 +-
 ...ass-sqlobject.converters.ConverterRegistry.html |   10 +-
 .../html/class-sqlobject.dbconnection.Boolean.html |    9 +-
 ...s-sqlobject.dbconnection.ConnMethodWrapper.html |    8 +-
 .../class-sqlobject.dbconnection.ConnWrapper.html  |    8 +-
 ...class-sqlobject.dbconnection.ConnectionHub.html |   16 +-
 ...sqlobject.dbconnection.ConnectionURIOpener.html |   14 +-
 ...class-sqlobject.dbconnection.ConsoleWriter.html |    8 +-
 docs/html/class-sqlobject.dbconnection.DBAPI.html  |   72 +-
 .../class-sqlobject.dbconnection.DBConnection.html |   18 +-
 .../class-sqlobject.dbconnection.Iteration.html    |   22 +-
 .../class-sqlobject.dbconnection.LogWriter.html    |    8 +-
 .../class-sqlobject.dbconnection.Transaction.html  |   28 +-
 docs/html/class-sqlobject.dberrors.DataError.html  |    4 +-
 .../class-sqlobject.dberrors.DatabaseError.html    |    4 +-
 ...ass-sqlobject.dberrors.DuplicateEntryError.html |    4 +-
 docs/html/class-sqlobject.dberrors.Error.html      |    4 +-
 .../class-sqlobject.dberrors.IntegrityError.html   |    4 +-
 .../class-sqlobject.dberrors.InterfaceError.html   |    4 +-
 .../class-sqlobject.dberrors.InternalError.html    |    4 +-
 ...class-sqlobject.dberrors.NotSupportedError.html |    4 +-
 .../class-sqlobject.dberrors.OperationalError.html |    4 +-
 .../class-sqlobject.dberrors.ProgrammingError.html |    4 +-
 docs/html/class-sqlobject.dberrors.Warning.html    |    4 +-
 .../class-sqlobject.declarative.Declarative.html   |   12 +-
 ...lass-sqlobject.declarative.DeclarativeMeta.html |    4 +-
 ...-sqlobject.declarative.classinstancemethod.html |    8 +-
 .../class-sqlobject.events.AddColumnSignal.html    |    4 +-
 .../class-sqlobject.events.ClassCreateSignal.html  |    4 +-
 .../class-sqlobject.events.CreateTableSignal.html  |    4 +-
 .../class-sqlobject.events.DeleteColumnSignal.html |    4 +-
 .../class-sqlobject.events.DropTableSignal.html    |    4 +-
 .../class-sqlobject.events.RowCreateSignal.html    |    4 +-
 .../class-sqlobject.events.RowCreatedSignal.html   |    4 +-
 .../class-sqlobject.events.RowDestroySignal.html   |    4 +-
 .../class-sqlobject.events.RowDestroyedSignal.html |    4 +-
 .../class-sqlobject.events.RowUpdateSignal.html    |    4 +-
 .../class-sqlobject.events.RowUpdatedSignal.html   |    4 +-
 docs/html/class-sqlobject.events.Signal.html       |    4 +-
 ...bird.firebirdconnection.FirebirdConnection.html |   42 +-
 .../class-sqlobject.include.hashcol.HashCol.html   |    8 +-
 ....include.pydispatch.errors.DispatcherError.html |  151 -
 ...clude.pydispatch.errors.DispatcherKeyError.html |  151 -
 ...lude.pydispatch.errors.DispatcherTypeError.html |  151 -
 ...lude.pydispatch.saferef.BoundMethodWeakref.html |  208 -
 ...bject.include.tests.test_hashcol.HashTest.html} |  127 +-
 docs/html/class-sqlobject.index.DatabaseIndex.html |   12 +-
 ...sqlobject.inheritance.InheritableSQLObject.html |   36 +-
 docs/html/class-sqlobject.joins.ManyToMany.html    |   12 +-
 docs/html/class-sqlobject.joins.MultipleJoin.html  |   12 +-
 docs/html/class-sqlobject.joins.OneToMany.html     |   12 +-
 docs/html/class-sqlobject.joins.RelatedJoin.html   |   12 +-
 .../class-sqlobject.joins.SQLMultipleJoin.html     |   12 +-
 .../html/class-sqlobject.joins.SQLRelatedJoin.html |   12 +-
 docs/html/class-sqlobject.joins.SingleJoin.html    |   12 +-
 docs/html/class-sqlobject.main.NoDefault.html      |    4 +-
 docs/html/class-sqlobject.main.SQLObject.html      |   80 +-
 ...ass-sqlobject.main.SQLObjectIntegrityError.html |    4 +-
 .../class-sqlobject.main.SQLObjectNotFound.html    |    4 +-
 docs/html/class-sqlobject.main.sqlmeta.html        |   30 +-
 .../class-sqlobject.manager.command.Command.html   |   40 +-
 ...ss-sqlobject.manager.command.CommandCreate.html |   42 +-
 ...lass-sqlobject.manager.command.CommandDrop.html |   42 +-
 ...s-sqlobject.manager.command.CommandExecute.html |   44 +-
 ...lass-sqlobject.manager.command.CommandHelp.html |   42 +-
 ...lass-sqlobject.manager.command.CommandList.html |   42 +-
 ...ss-sqlobject.manager.command.CommandRecord.html |   56 +-
 ...ss-sqlobject.manager.command.CommandRunner.html |   12 +-
 ...class-sqlobject.manager.command.CommandSQL.html |   42 +-
 ...ss-sqlobject.manager.command.CommandStatus.html |   44 +-
 ...s-sqlobject.manager.command.CommandUpgrade.html |   64 +-
 ...ject.manager.command.SQLObjectVersionTable.html |   30 +-
 ...axdb.maxdbconnection.IncorrectIDStyleError.html |    6 +-
 ...connection.LowerBoundOfSliceIsNotSupported.html |    6 +-
 ...ject.maxdb.maxdbconnection.MaxdbConnection.html |   38 +-
 ...maxdb.maxdbconnection.PrimaryKeyNotFounded.html |    6 +-
 ...t.maxdb.maxdbconnection.StyleMismatchError.html |    6 +-
 ...bject.maxdb.maxdbconnection.maxdbException.html |    6 +-
 ...ject.mssql.mssqlconnection.MSSQLConnection.html |   43 +-
 ...lobject.mysql.mysqlconnection.ErrorMessage.html |    4 +-
 ...ject.mysql.mysqlconnection.MySQLConnection.html |   42 +-
 ...lobject.postgres.pgconnection.ErrorMessage.html |    4 +-
 ...t.postgres.pgconnection.PostgresConnection.html |   42 +-
 ...dbhost.rdbhostconnection.RdbhostConnection.html |    8 +-
 docs/html/class-sqlobject.sqlbuilder.Alias.html    |   80 +-
 .../class-sqlobject.sqlbuilder.AliasField.html     |   82 +-
 .../class-sqlobject.sqlbuilder.AliasTable.html     |   82 +-
 docs/html/class-sqlobject.sqlbuilder.CONCAT.html   |   80 +-
 docs/html/class-sqlobject.sqlbuilder.ColumnAS.html |   82 +-
 .../class-sqlobject.sqlbuilder.ConstantSpace.html  |    4 +-
 docs/html/class-sqlobject.sqlbuilder.DESC.html     |   80 +-
 docs/html/class-sqlobject.sqlbuilder.Delete.html   |   82 +-
 docs/html/class-sqlobject.sqlbuilder.Field.html    |   82 +-
 .../class-sqlobject.sqlbuilder.INSubquery.html     |   80 +-
 .../class-sqlobject.sqlbuilder.ImportProxy.html    |   80 +-
 ...lass-sqlobject.sqlbuilder.ImportProxyField.html |   82 +-
 docs/html/class-sqlobject.sqlbuilder.Insert.html   |   82 +-
 docs/html/class-sqlobject.sqlbuilder.LIKE.html     |   82 +-
 .../class-sqlobject.sqlbuilder.NOTINSubquery.html  |   80 +-
 .../html/class-sqlobject.sqlbuilder.NoDefault.html |    4 +-
 docs/html/class-sqlobject.sqlbuilder.Outer.html    |    6 +-
 .../class-sqlobject.sqlbuilder.OuterField.html     |   82 +-
 .../class-sqlobject.sqlbuilder.OuterTable.html     |   82 +-
 docs/html/class-sqlobject.sqlbuilder.RLIKE.html    |   82 +-
 docs/html/class-sqlobject.sqlbuilder.Replace.html  |   84 +-
 docs/html/class-sqlobject.sqlbuilder.SQLCall.html  |   82 +-
 .../class-sqlobject.sqlbuilder.SQLConstant.html    |   82 +-
 .../class-sqlobject.sqlbuilder.SQLExpression.html  |   76 +-
 docs/html/class-sqlobject.sqlbuilder.SQLJoin.html  |   80 +-
 ...ss-sqlobject.sqlbuilder.SQLJoinConditional.html |   92 +-
 .../html/class-sqlobject.sqlbuilder.SQLJoinOn.html |   80 +-
 .../class-sqlobject.sqlbuilder.SQLJoinUsing.html   |   80 +-
 .../html/class-sqlobject.sqlbuilder.SQLModulo.html |   82 +-
 .../class-sqlobject.sqlbuilder.SQLObjectField.html |   82 +-
 .../class-sqlobject.sqlbuilder.SQLObjectState.html |    6 +-
 .../class-sqlobject.sqlbuilder.SQLObjectTable.html |   82 +-
 ...lobject.sqlbuilder.SQLObjectTableWithJoins.html |   82 +-
 docs/html/class-sqlobject.sqlbuilder.SQLOp.html    |   82 +-
 .../html/class-sqlobject.sqlbuilder.SQLPrefix.html |   82 +-
 ...ss-sqlobject.sqlbuilder.SQLTrueClauseClass.html |   80 +-
 docs/html/class-sqlobject.sqlbuilder.Select.html   |  102 +-
 docs/html/class-sqlobject.sqlbuilder.Subquery.html |   80 +-
 docs/html/class-sqlobject.sqlbuilder.Table.html    |   82 +-
 .../class-sqlobject.sqlbuilder.TableSpace.html     |    4 +-
 docs/html/class-sqlobject.sqlbuilder.Union.html    |   80 +-
 docs/html/class-sqlobject.sqlbuilder.Update.html   |   84 +-
 .../class-sqlobject.sqlbuilder.VersionError.html   |    4 +-
 ...bject.sqlite.sqliteconnection.ErrorMessage.html |    4 +-
 ...t.sqlite.sqliteconnection.SQLiteConnection.html |   52 +-
 .../class-sqlobject.sresults.SelectResults.html    |   54 +-
 docs/html/class-sqlobject.styles.DefaultStyle.html |   26 +-
 .../class-sqlobject.styles.MixedCaseStyle.html     |   24 +-
 ...-sqlobject.styles.MixedCaseUnderscoreStyle.html |   26 +-
 docs/html/class-sqlobject.styles.Style.html        |   24 +-
 ...t.sybase.sybaseconnection.SybaseConnection.html |   32 +-
 docs/html/class-sqlobject.versioning.Version.html  |   34 +-
 .../class-sqlobject.versioning.Versioning.html     |   16 +-
 docs/html/class-sqlobject.views.ViewSQLObject.html |   33 +-
 .../class-sqlobject.views.ViewSQLObjectField.html  |   66 +-
 .../class-sqlobject.views.ViewSQLObjectTable.html  |   66 +-
 docs/html/community.html                           |    3 +-
 docs/html/index.html                               |    1 +
 docs/html/layout.css                               |    0
 docs/html/module-index.html                        |   12 +-
 docs/html/module-sqlobject-index.html              | 4891 ++++++++++----------
 docs/html/module-sqlobject.__version__-index.html  |    7 -
 docs/html/module-sqlobject.__version__.html        |   10 +-
 .../module-sqlobject.boundattributes-index.html    |   18 +-
 docs/html/module-sqlobject.boundattributes.html    |   13 +-
 docs/html/module-sqlobject.cache-index.html        |  176 +-
 docs/html/module-sqlobject.cache.html              |    2 +-
 .../html/module-sqlobject.classregistry-index.html |   18 +-
 docs/html/module-sqlobject.classregistry.html      |   10 +-
 docs/html/module-sqlobject.col-index.html          |  736 +--
 docs/html/module-sqlobject.col.html                |  100 +-
 ...dex.html => module-sqlobject.compat-index.html} |   38 +-
 docs/html/module-sqlobject.compat.html             |   91 +
 docs/html/module-sqlobject.constraints-index.html  |   33 +-
 docs/html/module-sqlobject.constraints.html        |   27 +-
 docs/html/module-sqlobject.converters-index.html   |   59 +-
 docs/html/module-sqlobject.converters.html         |   57 +-
 docs/html/module-sqlobject.dbconnection-index.html |  190 +-
 docs/html/module-sqlobject.dbconnection.html       |   48 +-
 docs/html/module-sqlobject.dberrors-index.html     |   29 +-
 docs/html/module-sqlobject.dberrors.html           |   33 +-
 docs/html/module-sqlobject.declarative-index.html  |   18 +-
 docs/html/module-sqlobject.declarative.html        |    6 +-
 docs/html/module-sqlobject.events-index.html       |   26 +-
 docs/html/module-sqlobject.events.html             |   28 +-
 docs/html/module-sqlobject.firebird-index.html     |   38 +-
 ...qlobject.firebird.firebirdconnection-index.html |   36 +-
 ...dule-sqlobject.firebird.firebirdconnection.html |    2 +-
 docs/html/module-sqlobject.firebird.html           |    2 +-
 docs/html/module-sqlobject.html                    |   18 +-
 docs/html/module-sqlobject.include-index.html      |  381 +-
 .../module-sqlobject.include.hashcol-index.html    |    8 +-
 docs/html/module-sqlobject.include.hashcol.html    |    2 +-
 docs/html/module-sqlobject.include.html            |    7 +-
 .../module-sqlobject.include.pydispatch-index.html |  426 --
 ...object.include.pydispatch.dispatcher-index.html |  200 -
 ...le-sqlobject.include.pydispatch.dispatcher.html |  366 --
 ...-sqlobject.include.pydispatch.errors-index.html |  129 -
 ...module-sqlobject.include.pydispatch.errors.html |  114 -
 docs/html/module-sqlobject.include.pydispatch.html |  110 -
 ...module-sqlobject.include.pydispatch.robust.html |  118 -
 ...bject.include.pydispatch.robustapply-index.html |   99 -
 ...e-sqlobject.include.pydispatch.robustapply.html |  100 -
 ...sqlobject.include.pydispatch.saferef-index.html |  148 -
 ...odule-sqlobject.include.pydispatch.saferef.html |  144 -
 .../html/module-sqlobject.include.tests-index.html |  241 +
 ...de.html => module-sqlobject.include.tests.html} |   33 +-
 ...sqlobject.include.tests.test_hashcol-index.html |  230 +
 ...odule-sqlobject.include.tests.test_hashcol.html |  212 +
 docs/html/module-sqlobject.index-index.html        |   32 +-
 docs/html/module-sqlobject.index.html              |    2 +-
 docs/html/module-sqlobject.inheritance-index.html  |   39 +-
 docs/html/module-sqlobject.inheritance.html        |    2 +-
 docs/html/module-sqlobject.joins-index.html        |  102 +-
 docs/html/module-sqlobject.joins.html              |   14 +-
 docs/html/module-sqlobject.main-index.html         |  134 +-
 docs/html/module-sqlobject.main.html               |   16 +-
 docs/html/module-sqlobject.manager-index.html      |  215 +-
 .../module-sqlobject.manager.command-index.html    |  242 +-
 docs/html/module-sqlobject.manager.command.html    |   52 +-
 docs/html/module-sqlobject.maxdb-index.html        |   52 +-
 docs/html/module-sqlobject.maxdb.html              |    2 +-
 ...dule-sqlobject.maxdb.maxdbconnection-index.html |   50 +-
 .../module-sqlobject.maxdb.maxdbconnection.html    |   12 +-
 docs/html/module-sqlobject.mssql-index.html        |   39 +-
 docs/html/module-sqlobject.mssql.html              |    2 +-
 ...dule-sqlobject.mssql.mssqlconnection-index.html |   37 +-
 .../module-sqlobject.mssql.mssqlconnection.html    |    2 +-
 docs/html/module-sqlobject.mysql-index.html        |   54 +-
 ...dule-sqlobject.mysql.mysqlconnection-index.html |   54 +-
 .../module-sqlobject.mysql.mysqlconnection.html    |   20 +-
 docs/html/module-sqlobject.postgres-index.html     |   44 +-
 docs/html/module-sqlobject.postgres.html           |    2 +-
 ...dule-sqlobject.postgres.pgconnection-index.html |   42 +-
 .../module-sqlobject.postgres.pgconnection.html    |    6 +-
 docs/html/module-sqlobject.rdbhost-index.html      |    6 +-
 docs/html/module-sqlobject.rdbhost.html            |    2 +-
 ...-sqlobject.rdbhost.rdbhostconnection-index.html |    4 +-
 ...module-sqlobject.rdbhost.rdbhostconnection.html |    2 +-
 docs/html/module-sqlobject.sqlbuilder-index.html   | 1139 ++---
 docs/html/module-sqlobject.sqlbuilder.html         |  219 +-
 docs/html/module-sqlobject.sqlite-index.html       |   75 +-
 docs/html/module-sqlobject.sqlite.html             |    2 +-
 ...le-sqlobject.sqlite.sqliteconnection-index.html |   73 +-
 .../module-sqlobject.sqlite.sqliteconnection.html  |   13 +-
 docs/html/module-sqlobject.sresults-index.html     |   48 +-
 docs/html/module-sqlobject.sresults.html           |    2 +-
 docs/html/module-sqlobject.styles-index.html       |   46 +-
 docs/html/module-sqlobject.styles.html             |    8 +-
 docs/html/module-sqlobject.sybase-index.html       |   30 +-
 docs/html/module-sqlobject.sybase.html             |    2 +-
 ...le-sqlobject.sybase.sybaseconnection-index.html |   28 +-
 .../module-sqlobject.sybase.sybaseconnection.html  |    2 +-
 docs/html/module-sqlobject.util-index.html         |   22 +-
 .../module-sqlobject.util.csvexport-index.html     |    4 +-
 docs/html/module-sqlobject.util.csvexport.html     |    4 +-
 .../module-sqlobject.util.csvimport-index.html     |    6 +-
 docs/html/module-sqlobject.util.csvimport.html     |    6 +-
 .../module-sqlobject.util.moduleloader-index.html  |   12 +-
 docs/html/module-sqlobject.util.moduleloader.html  |    4 +-
 docs/html/module-sqlobject.versioning-index.html   |   75 +-
 docs/html/module-sqlobject.versioning.html         |   78 +-
 docs/html/module-sqlobject.views-index.html        |   25 +-
 docs/html/module-sqlobject.views.html              |   32 +-
 docs/html/pudge.css                                |    0
 docs/html/rst.css                                  |    0
 docs/html/sqlobject/__init__.py.html               |   24 +-
 docs/html/sqlobject/__version__.py.html            |    8 +-
 docs/html/sqlobject/boundattributes.py.html        |  227 +-
 docs/html/sqlobject/cache.py.html                  |  209 +-
 docs/html/sqlobject/classregistry.py.html          |  223 +-
 docs/html/sqlobject/col.py.html                    | 3353 +++++++-------
 docs/html/sqlobject/compat.py.html                 |  103 +
 docs/html/sqlobject/constraints.py.html            |  116 +-
 docs/html/sqlobject/converters.py.html             |  424 +-
 docs/html/sqlobject/dbconnection.py.html           | 2093 +++++----
 docs/html/sqlobject/dberrors.py.html               |   60 +-
 docs/html/sqlobject/declarative.py.html            |  332 +-
 docs/html/sqlobject/events.py.html                 |  651 +--
 docs/html/sqlobject/firebird/__init__.py.html      |   11 +-
 docs/html/sqlobject/index.py.html                  |  347 +-
 docs/html/sqlobject/inheritance/__init__.py.html   | 1040 +++--
 docs/html/sqlobject/joins.py.html                  | 1087 +++--
 docs/html/sqlobject/main.py.html                   | 3483 +++++++-------
 docs/html/sqlobject/maxdb/__init__.py.html         |   11 +-
 docs/html/sqlobject/mssql/__init__.py.html         |   11 +-
 docs/html/sqlobject/mysql/__init__.py.html         |    4 +-
 docs/html/sqlobject/postgres/__init__.py.html      |   11 +-
 docs/html/sqlobject/rdbhost/__init__.py.html       |   11 +-
 docs/html/sqlobject/sqlbuilder.py.html             | 2673 ++++++-----
 docs/html/sqlobject/sqlite/__init__.py.html        |   11 +-
 docs/html/sqlobject/sresults.py.html               |  683 +--
 docs/html/sqlobject/styles.py.html                 |  286 +-
 docs/html/sqlobject/sybase/__init__.py.html        |   11 +-
 docs/html/sqlobject/versioning/__init__.py.html    |  229 +-
 docs/html/sqlobject/views.py.html                  |  270 +-
 docs/index.txt                                     |    1 +
 docs/interface.py                                  |    4 +
 docs/rebuild                                       |    2 +-
 docs/test.py                                       |    4 +-
 scripts/sqlobject-admin                            |    5 +-
 scripts/sqlobject-convertOldURI                    |    3 +-
 setup.cfg                                          |    9 +-
 setup.py                                           |   53 +-
 sqlobject/__init__.py                              |   22 +-
 sqlobject/__version__.py                           |    8 +-
 sqlobject/boundattributes.py                       |   23 +-
 sqlobject/cache.py                                 |   20 +-
 sqlobject/classregistry.py                         |   11 +-
 sqlobject/col.py                                   |  475 +-
 sqlobject/compat.py                                |   31 +
 sqlobject/conftest.py                              |   60 +-
 sqlobject/constraints.py                           |   14 +
 sqlobject/converters.py                            |   69 +-
 sqlobject/dbconnection.py                          |  273 +-
 sqlobject/dberrors.py                              |   58 +-
 sqlobject/declarative.py                           |   37 +-
 sqlobject/events.py                                |   92 +-
 sqlobject/firebird/__init__.py                     |    3 +-
 sqlobject/firebird/firebirdconnection.py           |  171 +-
 sqlobject/include/hashcol.py                       |   85 +-
 sqlobject/include/pydispatch/README.txt            |    9 -
 sqlobject/include/pydispatch/__init__.py           |    6 -
 sqlobject/include/pydispatch/dispatcher.py         |  497 --
 sqlobject/include/pydispatch/errors.py             |   10 -
 sqlobject/include/pydispatch/robust.py             |   57 -
 sqlobject/include/pydispatch/robustapply.py        |   46 -
 sqlobject/include/pydispatch/saferef.py            |  165 -
 sqlobject/index.py                                 |   39 +-
 sqlobject/inheritance/__init__.py                  |  228 +-
 sqlobject/inheritance/iteration.py                 |   23 +-
 sqlobject/inheritance/tests/testDestroyCascade.py  |    5 +-
 sqlobject/inheritance/tests/test_aggregates.py     |    3 +
 sqlobject/inheritance/tests/test_asdict.py         |   16 +-
 .../inheritance/tests/test_deep_inheritance.py     |   33 +-
 sqlobject/inheritance/tests/test_foreignKey.py     |   21 +-
 sqlobject/inheritance/tests/test_indexes.py        |   27 +-
 sqlobject/inheritance/tests/test_inheritance.py    |   37 +-
 .../inheritance/tests/test_inheritance_tree.py     |   15 +-
 sqlobject/joins.py                                 |  161 +-
 sqlobject/main.py                                  |  424 +-
 sqlobject/manager/command.py                       |  474 +-
 sqlobject/maxdb/__init__.py                        |    5 +-
 sqlobject/maxdb/maxdbconnection.py                 |  622 +--
 sqlobject/mssql/__init__.py                        |    3 +-
 sqlobject/mssql/mssqlconnection.py                 |   79 +-
 sqlobject/mysql/__init__.py                        |    4 +-
 sqlobject/mysql/mysqlconnection.py                 |  145 +-
 sqlobject/postgres/__init__.py                     |    3 +-
 sqlobject/postgres/pgconnection.py                 |   96 +-
 sqlobject/rdbhost/__init__.py                      |    3 +-
 sqlobject/rdbhost/rdbhostconnection.py             |    6 +-
 sqlobject/sqlbuilder.py                            |  426 +-
 sqlobject/sqlite/__init__.py                       |    3 +-
 sqlobject/sqlite/sqliteconnection.py               |  124 +-
 sqlobject/sresults.py                              |  109 +-
 sqlobject/styles.py                                |   34 +-
 sqlobject/sybase/__init__.py                       |    3 +-
 sqlobject/sybase/sybaseconnection.py               |   22 +-
 sqlobject/tests/dbtest.py                          |   49 +-
 sqlobject/tests/test_ForeignKey.py                 |   47 +-
 sqlobject/tests/test_NoneValuedResultItem.py       |   13 +-
 sqlobject/tests/test_SQLMultipleJoin.py            |   43 +-
 sqlobject/tests/test_SQLRelatedJoin.py             |   28 +-
 sqlobject/tests/test_SingleJoin.py                 |   11 +-
 sqlobject/tests/test_aggregates.py                 |   22 +-
 sqlobject/tests/test_aliases.py                    |   21 +-
 sqlobject/tests/test_asdict.py                     |    5 +-
 sqlobject/tests/test_auto.py                       |   47 +-
 sqlobject/tests/test_basic.py                      |   60 +-
 sqlobject/tests/test_blob.py                       |   16 +-
 sqlobject/tests/test_boundattributes.py            |   16 +-
 sqlobject/tests/test_cache.py                      |   16 +-
 sqlobject/tests/test_class_hash.py                 |   22 +
 sqlobject/tests/test_columns_order.py              |    5 +-
 sqlobject/tests/test_combining_joins.py            |   13 +-
 sqlobject/tests/test_comparison.py                 |    4 +-
 sqlobject/tests/test_complex_sorting.py            |   77 +
 sqlobject/tests/test_constraints.py                |   19 +-
 sqlobject/tests/test_converters.py                 |   98 +-
 sqlobject/tests/test_create_drop.py                |    2 +
 sqlobject/tests/test_csvexport.py                  |   29 +-
 sqlobject/tests/test_cyclic_reference.py           |   10 +-
 sqlobject/tests/test_datetime.py                   |   17 +-
 sqlobject/tests/test_decimal.py                    |   80 +-
 sqlobject/tests/test_declarative.py                |   11 +-
 sqlobject/tests/test_default_style.py              |   32 +-
 sqlobject/tests/test_delete.py                     |   24 +-
 sqlobject/tests/test_distinct.py                   |   13 +-
 sqlobject/tests/test_empty.py                      |    5 +-
 sqlobject/tests/test_enum.py                       |   11 +-
 sqlobject/tests/test_events.py                     |   30 +-
 sqlobject/tests/test_exceptions.py                 |   11 +-
 sqlobject/tests/test_expire.py                     |    5 +-
 sqlobject/tests/test_groupBy.py                    |   12 +-
 sqlobject/tests/test_identity.py                   |    9 +-
 sqlobject/tests/test_indexes.py                    |   79 +-
 sqlobject/tests/test_inheritance.py                |   12 +-
 sqlobject/tests/test_joins.py                      |   22 +-
 sqlobject/tests/test_joins_conditional.py          |   52 +-
 sqlobject/tests/test_lazy.py                       |    5 +-
 sqlobject/tests/test_md5.py                        |   12 +-
 sqlobject/tests/test_mysql.py                      |    8 +-
 sqlobject/tests/test_new_joins.py                  |   32 +-
 sqlobject/tests/test_parse_uri.py                  |   53 +-
 sqlobject/tests/test_paste.py                      |   18 +-
 sqlobject/tests/test_perConnection.py              |    8 +-
 sqlobject/tests/test_pickle.py                     |   16 +-
 sqlobject/tests/test_picklecol.py                  |   13 +-
 sqlobject/tests/test_postgres.py                   |   38 +-
 sqlobject/tests/test_psycopg_sslmode.py            |   25 -
 sqlobject/tests/test_reparent_sqlmeta.py           |    5 +-
 sqlobject/tests/test_schema.py                     |    8 +-
 sqlobject/tests/test_select.py                     |   63 +-
 sqlobject/tests/test_select_through.py             |   36 +-
 sqlobject/tests/test_setters.py                    |    8 +-
 sqlobject/tests/test_slice.py                      |   27 +-
 sqlobject/tests/test_sorting.py                    |   48 +-
 sqlobject/tests/test_sqlbuilder.py                 |   33 +-
 sqlobject/tests/test_sqlbuilder_dbspecific.py      |   35 +-
 sqlobject/tests/test_sqlbuilder_importproxy.py     |    9 +-
 sqlobject/tests/test_sqlbuilder_joins_instances.py |   74 +-
 sqlobject/tests/test_sqlite.py                     |  141 +-
 sqlobject/tests/test_sqlmeta_idName.py             |    9 +
 sqlobject/tests/test_sqlobject_admin.py            |   14 +-
 sqlobject/tests/test_string_id.py                  |    5 +-
 sqlobject/tests/test_style.py                      |   12 +-
 sqlobject/tests/test_subqueries.py                 |   93 +-
 sqlobject/tests/test_transactions.py               |   26 +-
 sqlobject/tests/test_unicode.py                    |  100 +-
 sqlobject/tests/test_validation.py                 |   35 +-
 sqlobject/tests/test_views.py                      |   68 +-
 sqlobject/util/csvexport.py                        |   31 +-
 sqlobject/util/csvimport.py                        |   63 +-
 sqlobject/util/moduleloader.py                     |   10 +-
 sqlobject/versioning/__init__.py                   |   47 +-
 sqlobject/versioning/test/test_version.py          |   42 +-
 sqlobject/views.py                                 |   83 +-
 sqlobject/wsgi_middleware.py                       |   20 +-
 tox.ini                                            |   89 +
 507 files changed, 23992 insertions(+), 23286 deletions(-)

diff --cc debian/.git-dpm
index 23e5f09,0000000..2f27f91
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 346bcc378817303bace526cac0c64de22ccfbf69
- 346bcc378817303bace526cac0c64de22ccfbf69
- 47be57eb45e85598746ade2d787e2162a0f66589
++a4bc9c63f6e4e79c968cc54301f579e32e57cb5e
++a4bc9c63f6e4e79c968cc54301f579e32e57cb5e
++ced1ca4e28c774f8711a474029b83ab2f1adf3e5
 +ced1ca4e28c774f8711a474029b83ab2f1adf3e5
 +sqlobject_3.0.0.orig.tar.gz
 +32bab12b6b38726c3315d7cb6c5c960eb7ea131f
 +892316
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Remove-docs-from-installed-files.patch
index 32a8e4f,0000000..795b752
mode 100644,000000..100644
--- a/debian/patches/0005-Remove-docs-from-installed-files.patch
+++ b/debian/patches/0005-Remove-docs-from-installed-files.patch
@@@ -1,44 -1,0 +1,44 @@@
- From 346bcc378817303bace526cac0c64de22ccfbf69 Mon Sep 17 00:00:00 2001
++From a4bc9c63f6e4e79c968cc54301f579e32e57cb5e Mon Sep 17 00:00:00 2001
 +From: Neil <neil at dip.sun.ac.za>
 +Date: Thu, 29 Oct 2015 13:33:31 +0200
 +Subject: Remove docs from installed files
 +
 +We don't want to install the documentation in the package as well,
 +since we already install it under /usr/share/doc, so we exclude
 +it from setup.py
 +---
 + setup.py | 21 ---------------------
 + 1 file changed, 21 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index e8883c6..58968fa 100755
++index 5fe278c..9490fd4 100755
 +--- a/setup.py
 ++++ b/setup.py
- @@ -77,27 +77,6 @@ and `GitHub <https://github.com/sqlobject>`_.
-        license="LGPL",
-        packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
++@@ -80,27 +80,6 @@ and `GitHub <https://github.com/sqlobject>`_.
++       packages=["sqlobject"] +
++           ['sqlobject.%s' % package for package in subpackages],
 +       scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
- -      package_data={"sqlobject": [
++-      package_data={"sqlobject":
++-                    [
 +-                        "../docs/LICENSE", "../docs/*.txt", "../docs/*.css",
 +-                        "../docs/html/*.html", "../docs/html/*.css",
 +-                        "../docs/html/sqlobject/*.html",
 +-                        "../docs/html/sqlobject/firebird/*.html",
 +-                        "../docs/html/sqlobject/include/*.html",
 +-                        "../docs/html/sqlobject/inheritance/*.html",
 +-                        "../docs/html/sqlobject/manager/*.html",
 +-                        "../docs/html/sqlobject/maxdb/*.html",
 +-                        "../docs/html/sqlobject/mssql/*.html",
 +-                        "../docs/html/sqlobject/mysql/*.html",
 +-                        "../docs/html/sqlobject/postgres/*.html",
 +-                        "../docs/html/sqlobject/rdbhost/*.html",
 +-                        "../docs/html/sqlobject/sqlite/*.html",
 +-                        "../docs/html/sqlobject/sybase/*.html",
 +-                        "../docs/html/sqlobject/util/*.html",
 +-                        "../docs/html/sqlobject/versioning/*.html",
 +-                    ],
- -                    "sqlobject.include": ["pydispatch/README.txt"],
 +-                    "sqlobject.maxdb": ["readme.txt"],
- -                   },
++-                    },
 +       **kw
 +       )
 + 
diff --cc debian/patches/change_doc_build_script
index d507b4b,0000000..5bf7eab
mode 100644,000000..100644
--- a/debian/patches/change_doc_build_script
+++ b/debian/patches/change_doc_build_script
@@@ -1,32 -1,0 +1,32 @@@
- From cf3b36888c2bbcefd4958ba10fc09758023e5e23 Mon Sep 17 00:00:00 2001
++From d282bbe89eb2cfbfc5a5729ef401a210c8145e60 Mon Sep 17 00:00:00 2001
 +From: Neil Muller <drnlmuller+debian at gmail.com>
 +Date: Thu, 8 Oct 2015 14:08:55 -0700
 +Subject: Use rst2html from python-docutils to build the documentation.
 +
 +Forwarded: not-needed
 +Last-Update: 2014-04-13
 +
 +Patch-Name: change_doc_build_script
 +---
 + docs/rebuild | 6 +++---
 + 1 file changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/docs/rebuild b/docs/rebuild
- index 65729f8..cee45f0 100755
++index 82e6cc6..e4969a3 100755
 +--- a/docs/rebuild
 ++++ b/docs/rebuild
 +@@ -12,11 +12,11 @@ NORMAL="Authors DeveloperGuide FAQ Inheritance
 +         community download index links sqlobject-admin"
 + 
 + for NAME in $NORMAL ; do
 +-    if [ -e "$NAME.html" -a ! "$NAME.html" -ot "$NAME.txt" ] ; then
 ++    if [ -e "docs/$NAME.html" -a ! "docs/$NAME.html" -ot "docs/$NAME.txt" ] ; then
 +         echo "$NAME is up to date."
 +         continue
 +     fi
 +     echo "Building $NAME."
 +-    rst2html.py --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
 +-        -- "$NAME.txt" > "$NAME.html"
 ++    rst2html --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
 ++        -- "docs/$NAME.txt" > "docs/$NAME.html"
 + done
diff --cc debian/patches/get_rid_of_setuptools
index c0bdceb,0000000..ea7afb9
mode 100644,000000..100644
--- a/debian/patches/get_rid_of_setuptools
+++ b/debian/patches/get_rid_of_setuptools
@@@ -1,33 -1,0 +1,33 @@@
- From 4cbef15176c7efab5d007461d2626e44b089450f Mon Sep 17 00:00:00 2001
++From 397877369cfd4326d7fbe993216e6bde3eb5e2ed Mon Sep 17 00:00:00 2001
 +From: Bernd Zeimetz <bzed at debian.org>
 +Date: Thu, 8 Oct 2015 14:08:54 -0700
 +Subject: Remove the unnecessary setuptools requirement.
 +
 +Last-Update: 2014-04-13
 +
 +Patch-Name: get_rid_of_setuptools
 +---
 + setup.py | 10 ++--------
 + 1 file changed, 2 insertions(+), 8 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 75b7e07..e8883c6 100755
++index 834893d..5fe278c 100755
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -3,14 +3,8 @@
 + from imp import load_source
-  from os.path import abspath, dirname, isfile, join
++ from os.path import abspath, dirname, join
 + 
 +-try:
 +-    from ez_setup import use_setuptools
 +-    use_setuptools()
 +-    from setuptools import setup
 +-    is_setuptools = True
 +-except ImportError:
 +-    from distutils.core import setup
 +-    is_setuptools = False
 ++from distutils.core import setup
 ++is_setuptools = False
 + 
 + versionpath = join(abspath(dirname(__file__)), "sqlobject", "__version__.py")
 + load_source("sqlobject_version", versionpath)
diff --cc debian/patches/remove_pkg_resources
index ebc750b,0000000..e3b347d
mode 100644,000000..100644
--- a/debian/patches/remove_pkg_resources
+++ b/debian/patches/remove_pkg_resources
@@@ -1,31 -1,0 +1,31 @@@
- From d99eb5fa3b29c903662fd2f32e9dbee279e2d411 Mon Sep 17 00:00:00 2001
++From 2eee1a7bf8546339b7058a173a0adea8a7fddfab Mon Sep 17 00:00:00 2001
 +From: Neil Muller <drnlmuller+debian at gmail.com>
 +Date: Thu, 8 Oct 2015 14:08:56 -0700
 +Subject: We don't need pkg_resources to run the test suite during the
 +
 + build, so remove that dependency.
 +Forwarded: not-needed
 +Last-Update: 2014-04-13
 +
 +Patch-Name: remove_pkg_resources
 +---
 + sqlobject/conftest.py | 6 ------
 + 1 file changed, 6 deletions(-)
 +
 +diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
- index 6e1d60e..fb222cf 100644
++index 1d9dc26..967ab44 100644
 +--- a/sqlobject/conftest.py
 ++++ b/sqlobject/conftest.py
- @@ -11,12 +11,6 @@ import py
-  import os
++@@ -6,12 +6,6 @@ application.
++ import py
 + import sqlobject
 + 
 +-try:
 +-    import pkg_resources
- -except ImportError: # Python 2.2
++-except ImportError:  # Python 2.2
 +-    pass
 +-else:
 +-    pkg_resources.require('SQLObject')
 + 
-  connectionShortcuts = {
-      'mysql': 'mysql://test@localhost/test',
++ # Override some options (doesn't override command line):
++ verbose = 0
diff --cc debian/patches/replace_sf_logo
index 2c0ae93,0000000..6d509aa
mode 100644,000000..100644
--- a/debian/patches/replace_sf_logo
+++ b/debian/patches/replace_sf_logo
@@@ -1,396 -1,0 +1,396 @@@
- From 06b1f08af326c4c8c8aa4e3dc15e94100c2240ff Mon Sep 17 00:00:00 2001
++From 0b0e6c4d8306edc248f80c24e64d1866e0a1b108 Mon Sep 17 00:00:00 2001
 +From: Neil Muller <drnlmuller+debian at gmail.com>
 +Date: Thu, 8 Oct 2015 14:08:57 -0700
 +Subject: Replace the image link to the sourceforge site with a simple text
 +
 + footer including the link.
 + .
 + The image link links to an external sourceforge url, which triggers lintian's
 + privacy-breach-logo error. This avoids the entire issue and avoids dragging
 + the sourceforge logo into the package.
 +Last-Update: 2015-10-28
 +
 +Patch-Name: replace_sf_logo
 +---
 + docs/Authors.txt         | 10 +++-------
 + docs/DeveloperGuide.txt  | 10 +++-------
 + docs/FAQ.txt             | 10 +++-------
 + docs/Inheritance.txt     | 10 +++-------
 + docs/News.txt            | 10 +++-------
 + docs/News1.txt           | 10 +++-------
 + docs/News2.txt           | 10 +++-------
 + docs/News3.txt           | 10 +++-------
 + docs/News4.txt           | 10 +++-------
 + docs/SQLBuilder.txt      | 10 +++-------
 + docs/SQLObject.txt       | 10 +++-------
 + docs/SelectResults.txt   | 10 +++-------
 + docs/TODO.txt            | 10 +++-------
 + docs/Versioning.txt      | 10 +++-------
 + docs/Views.txt           | 10 +++-------
 + docs/community.txt       | 10 +++-------
 + docs/download.txt        | 10 +++-------
 + docs/index.txt           | 10 +++-------
 + docs/links.txt           | 10 +++-------
 + docs/sqlobject-admin.txt | 10 +++-------
 + 20 files changed, 60 insertions(+), 140 deletions(-)
 +
 +diff --git a/docs/Authors.txt b/docs/Authors.txt
- index f579d3d..72faf05 100644
++index 5dbc625..43a145e 100644
 +--- a/docs/Authors.txt
 ++++ b/docs/Authors.txt
- @@ -34,10 +34,6 @@ Contributions have been made by:
++@@ -35,10 +35,6 @@ Contributions have been made by:
 + * Nathan Edwards <nje5 at georgetown.edu>
 + * Oleg Broytman <phd at phdru.name>
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.txt
- index 9e2eda1..3abce20 100644
++index 4453733..4e091b1 100644
 +--- a/docs/DeveloperGuide.txt
 ++++ b/docs/DeveloperGuide.txt
- @@ -191,10 +191,6 @@ directory.  Pudge converts documentation from Restructured Text to
++@@ -197,10 +197,6 @@ directory.  Pudge converts documentation from Restructured Text to
 + HTML.  It presently requires kid 0.9.3, which must be obtained
 + separately (for instance, from http://pypi.python.org/pypi/kid/0.9.3)
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/FAQ.txt b/docs/FAQ.txt
 +index 3238efb..d905c01 100644
 +--- a/docs/FAQ.txt
 ++++ b/docs/FAQ.txt
 +@@ -588,10 +588,6 @@ Maybe you want to specify the charset too? No problem::
 +                     COLLATE utf8_estonian_ci''']
 +                 }
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/Inheritance.txt b/docs/Inheritance.txt
 +index c3de5f4..f40ecee 100644
 +--- a/docs/Inheritance.txt
 ++++ b/docs/Inheritance.txt
 +@@ -325,10 +325,6 @@ Limitations and notes
 + * If you have suggestion, bugs, or patch to this patch, you can
 +   contact the SQLObject team: <sqlobject-discuss at lists.sourceforge.net>
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/News.txt b/docs/News.txt
- index 6f1118c..a415164 100644
++index 3cfec6e..71b7f4a 100644
 +--- a/docs/News.txt
 ++++ b/docs/News.txt
- @@ -634,10 +634,6 @@ Features & Interface
++@@ -661,10 +661,6 @@ Features & Interface
 + 
 + .. __: News4.html
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/News1.txt b/docs/News1.txt
 +index 77296c2..eca06a1 100644
 +--- a/docs/News1.txt
 ++++ b/docs/News1.txt
 +@@ -456,10 +456,6 @@ Features
 + 
 + .. _Col docs: SQLObject.html#col-class-specifying-columns
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/News2.txt b/docs/News2.txt
 +index f9cf012..35dbee3 100644
 +--- a/docs/News2.txt
 ++++ b/docs/News2.txt
 +@@ -597,10 +597,6 @@ Bug Fixes
 + 
 + .. __: News1.html
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/News3.txt b/docs/News3.txt
 +index 840eedd..c831d0f 100644
 +--- a/docs/News3.txt
 ++++ b/docs/News3.txt
 +@@ -382,10 +382,6 @@ Bug Fixes
 + 
 + .. __: News2.html
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/News4.txt b/docs/News4.txt
 +index 11f76d4..71c1bd4 100644
 +--- a/docs/News4.txt
 ++++ b/docs/News4.txt
 +@@ -323,10 +323,6 @@ Minor features
 + 
 + .. __: News3.html
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/SQLBuilder.txt b/docs/SQLBuilder.txt
- index 096b2e7..165e13a 100644
++index f2678fe..d27a40a 100644
 +--- a/docs/SQLBuilder.txt
 ++++ b/docs/SQLBuilder.txt
 +@@ -259,10 +259,6 @@ call. To work around this issue, use ``IN``::
 +        IN(PersonWorkplace.q.WorkplaceID,
 +        Select(Workplace.q.id, Workplace.q.id==SOME_ID)))
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/SQLObject.txt b/docs/SQLObject.txt
- index 59a50f2..667b99b 100644
++index 4b04f44..42ac17d 100644
 +--- a/docs/SQLObject.txt
 ++++ b/docs/SQLObject.txt
- @@ -2082,10 +2082,6 @@ Documentation`_.
++@@ -2112,10 +2112,6 @@ Documentation`_.
 + .. _SQLBuilder: SQLBuilder.html
 + .. _`SQLBuilder Documentation`: SQLBuilder.html
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/SelectResults.txt b/docs/SelectResults.txt
 +index 7f2836e..feb885a 100644
 +--- a/docs/SelectResults.txt
 ++++ b/docs/SelectResults.txt
 +@@ -193,10 +193,6 @@ named ``teachers``. Similarily, with a self-joining foreign key named
 + returns a SelectResult of Persons who are the paternal grandfather of someone
 + named ``Steve``.
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
 +-   :class: noborder
 +-   :align: center
 +-   :height: 15
 +-   :width: 80
 +-   :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
 ++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
 ++
 ++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
 +diff --git a/docs/TODO.txt b/docs/TODO.txt
- index 31170c2..115d939 100644
++index 588f89b..d27e5a0 100644
 +--- a/docs/TODO.txt
 ++++ b/docs/TODO.txt
- @@ -133,10 +133,6 @@ TODO
++@@ -124,10 +124,6 @@ TODO
 + * Allow to override ConsoleWriter/LogWriter classes and makeDebugWriter
 +   function.
 + 
 +-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
 +-   :target: https://sourceforge.net/projects/sqlobject
... 138 lines suppressed ...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sqlobject.git



More information about the Python-modules-commits mailing list