[Python-modules-commits] [sqlobject] 09/20: merge patched into master
Neil Muller
drnlmza-guest at moszumanska.debian.org
Wed May 11 09:48:31 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 44ba3273b79ab1a718f5c708784570a1ed1e2b2f
Merge: 8e818d6 349bfec
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date: Tue May 10 16:39:48 2016 +0200
merge patched into master
PKG-INFO | 8 +-
README.txt | 2 +-
SQLObject.egg-info/PKG-INFO | 8 +-
SQLObject.egg-info/SOURCES.txt | 7 +-
SQLObject.egg-info/pbr.json | 1 -
debian/.git-dpm | 6 +-
.../0005-Remove-docs-from-installed-files.patch | 4 +-
debian/patches/change_doc_build_script | 2 +-
debian/patches/get_rid_of_setuptools | 4 +-
debian/patches/remove_pkg_resources | 2 +-
debian/patches/replace_sf_logo | 128 +-
docs/Authors.txt | 1 +
docs/DeveloperGuide.txt | 2 +-
docs/News.txt | 66 +
docs/SQLObject.txt | 2 +-
docs/community.txt | 4 +-
docs/download.txt | 2 +-
docs/html/Authors.html | 3 +-
docs/html/DeveloperGuide.html | 4 +-
docs/html/FAQ.html | 2 +-
docs/html/Inheritance.html | 2 +-
docs/html/News.html | 249 +-
docs/html/News1.html | 2 +-
docs/html/News2.html | 2 +-
docs/html/News3.html | 2 +-
docs/html/News4.html | 2 +-
docs/html/SQLBuilder.html | 2 +-
docs/html/SQLObject.html | 4 +-
docs/html/SelectResults.html | 2 +-
docs/html/TODO.html | 2 +-
docs/html/Versioning.html | 2 +-
docs/html/Views.html | 2 +-
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 | 40 +-
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 | 69 +-
docs/html/class-sqlobject.col.SOIntCol.html | 42 +-
docs/html/class-sqlobject.col.SOKeyCol.html | 42 +-
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 +-
...class-sqlobject.dbconnection.ConnectionHub.html | 2 +-
...bird.firebirdconnection.FirebirdConnection.html | 2 +-
.../class-sqlobject.include.hashcol.HashCol.html | 4 +-
docs/html/class-sqlobject.index.DatabaseIndex.html | 2 +-
docs/html/class-sqlobject.joins.MultipleJoin.html | 4 +-
docs/html/class-sqlobject.joins.RelatedJoin.html | 4 +-
.../class-sqlobject.joins.SQLMultipleJoin.html | 4 +-
.../html/class-sqlobject.joins.SQLRelatedJoin.html | 4 +-
docs/html/class-sqlobject.joins.SingleJoin.html | 4 +-
docs/html/class-sqlobject.main.SQLObject.html | 4 +-
.../class-sqlobject.manager.command.Command.html | 2 +-
...ss-sqlobject.manager.command.CommandCreate.html | 4 +-
...lass-sqlobject.manager.command.CommandDrop.html | 4 +-
...s-sqlobject.manager.command.CommandExecute.html | 4 +-
...lass-sqlobject.manager.command.CommandHelp.html | 4 +-
...lass-sqlobject.manager.command.CommandList.html | 4 +-
...ss-sqlobject.manager.command.CommandRecord.html | 6 +-
...class-sqlobject.manager.command.CommandSQL.html | 4 +-
...ss-sqlobject.manager.command.CommandStatus.html | 4 +-
...s-sqlobject.manager.command.CommandUpgrade.html | 8 +-
...ject.manager.command.SQLObjectVersionTable.html | 4 +-
...ject.mssql.mssqlconnection.MSSQLConnection.html | 53 +-
...html => class-sqlobject.sqlbuilder.CONCAT.html} | 22 +-
docs/html/class-sqlobject.sqlbuilder.Delete.html | 2 +-
.../class-sqlobject.sqlbuilder.INSubquery.html | 10 +-
.../class-sqlobject.sqlbuilder.ImportProxy.html | 8 +-
...lass-sqlobject.sqlbuilder.ImportProxyField.html | 6 +-
docs/html/class-sqlobject.sqlbuilder.Insert.html | 2 +-
docs/html/class-sqlobject.sqlbuilder.LIKE.html | 12 +-
.../class-sqlobject.sqlbuilder.NOTINSubquery.html | 10 +-
docs/html/class-sqlobject.sqlbuilder.Outer.html | 6 +-
.../class-sqlobject.sqlbuilder.OuterField.html | 6 +-
.../class-sqlobject.sqlbuilder.OuterTable.html | 4 +-
docs/html/class-sqlobject.sqlbuilder.RLIKE.html | 12 +-
docs/html/class-sqlobject.sqlbuilder.Replace.html | 2 +-
docs/html/class-sqlobject.sqlbuilder.SQLJoin.html | 8 +-
...ss-sqlobject.sqlbuilder.SQLJoinConditional.html | 8 +-
.../html/class-sqlobject.sqlbuilder.SQLJoinOn.html | 8 +-
.../class-sqlobject.sqlbuilder.SQLJoinUsing.html | 8 +-
docs/html/class-sqlobject.sqlbuilder.Select.html | 2 +-
docs/html/class-sqlobject.sqlbuilder.Subquery.html | 8 +-
docs/html/class-sqlobject.sqlbuilder.Update.html | 2 +-
.../class-sqlobject.sresults.SelectResults.html | 4 +-
docs/html/community.html | 6 +-
docs/html/download.html | 4 +-
docs/html/index.html | 2 +-
docs/html/links.html | 4 +-
docs/html/module-sqlobject-index.html | 2417 ++++++++-------
docs/html/module-sqlobject.__version__-index.html | 15 +-
docs/html/module-sqlobject.__version__.html | 8 +-
docs/html/module-sqlobject.classregistry.html | 2 +-
docs/html/module-sqlobject.col-index.html | 871 +++---
docs/html/module-sqlobject.col.html | 125 +-
docs/html/module-sqlobject.converters-index.html | 42 +-
docs/html/module-sqlobject.converters.html | 50 +-
docs/html/module-sqlobject.dbconnection.html | 2 +-
docs/html/module-sqlobject.html | 10 +-
docs/html/module-sqlobject.include-index.html | 9 -
docs/html/module-sqlobject.include.html | 8 +-
...le-sqlobject.include.pydispatch.dispatcher.html | 4 +-
.../html/module-sqlobject.include.tests-index.html | 78 -
docs/html/module-sqlobject.include.tests.html | 63 -
docs/html/module-sqlobject.joins-index.html | 7 +
docs/html/module-sqlobject.main.html | 2 +-
docs/html/module-sqlobject.manager-index.html | 21 +-
.../module-sqlobject.manager.command-index.html | 171 +-
docs/html/module-sqlobject.manager.command.html | 2 +-
docs/html/module-sqlobject.mssql-index.html | 51 +-
...dule-sqlobject.mssql.mssqlconnection-index.html | 51 +-
.../module-sqlobject.mssql.mssqlconnection.html | 4 +-
docs/html/module-sqlobject.sqlbuilder-index.html | 1200 ++++++--
docs/html/module-sqlobject.sqlbuilder.html | 136 +-
docs/html/module-sqlobject.versioning.html | 10 +-
docs/html/module-sqlobject.views.html | 8 +-
docs/html/sqlobject-admin.html | 2 +-
docs/html/sqlobject/__init__.py.html | 2 +-
docs/html/sqlobject/__version__.py.html | 12 +-
docs/html/sqlobject/boundattributes.py.html | 2 +-
docs/html/sqlobject/cache.py.html | 2 +-
docs/html/sqlobject/classregistry.py.html | 2 +-
docs/html/sqlobject/col.py.html | 3131 ++++++++++----------
docs/html/sqlobject/constraints.py.html | 2 +-
docs/html/sqlobject/converters.py.html | 108 +-
docs/html/sqlobject/dbconnection.py.html | 2 +-
docs/html/sqlobject/dberrors.py.html | 2 +-
docs/html/sqlobject/declarative.py.html | 2 +-
docs/html/sqlobject/events.py.html | 2 +-
docs/html/sqlobject/firebird/__init__.py.html | 2 +-
docs/html/sqlobject/include/__init__.py.html | 2 +-
docs/html/sqlobject/index.py.html | 2 +-
docs/html/sqlobject/inheritance/__init__.py.html | 2 +-
docs/html/sqlobject/joins.py.html | 2 +-
docs/html/sqlobject/main.py.html | 2 +-
docs/html/sqlobject/manager/__init__.py.html | 2 +-
docs/html/sqlobject/maxdb/__init__.py.html | 2 +-
docs/html/sqlobject/mssql/__init__.py.html | 2 +-
docs/html/sqlobject/mysql/__init__.py.html | 2 +-
docs/html/sqlobject/postgres/__init__.py.html | 2 +-
docs/html/sqlobject/rdbhost/__init__.py.html | 2 +-
docs/html/sqlobject/sqlbuilder.py.html | 771 ++---
docs/html/sqlobject/sqlite/__init__.py.html | 2 +-
docs/html/sqlobject/sresults.py.html | 2 +-
docs/html/sqlobject/styles.py.html | 2 +-
docs/html/sqlobject/sybase/__init__.py.html | 2 +-
docs/html/sqlobject/util/__init__.py.html | 2 +-
docs/html/sqlobject/versioning/__init__.py.html | 2 +-
docs/html/sqlobject/views.py.html | 2 +-
docs/links.txt | 2 +-
setup.py | 4 +-
sqlobject/__version__.py | 10 +-
sqlobject/col.py | 78 +-
sqlobject/converters.py | 22 +-
sqlobject/include/hashcol.py | 2 +-
sqlobject/mssql/mssqlconnection.py | 15 +
sqlobject/sqlbuilder.py | 11 +
sqlobject/tests/dbtest.py | 31 +-
sqlobject/tests/test_ForeignKey.py | 33 +
sqlobject/tests/test_datetime.py | 22 +-
sqlobject/tests/test_sqlbuilder.py | 18 +
200 files changed, 6566 insertions(+), 5252 deletions(-)
diff --cc debian/.git-dpm
index 9315baf,0000000..1ace50a
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
- 00ca43b4d372272b3baf10ea6809fb626490233c
- 00ca43b4d372272b3baf10ea6809fb626490233c
- b0fc031ef948e5006e0776374d265fe894b73917
++349bfec553e7893e68c0935c1137f2b7e2b55182
++349bfec553e7893e68c0935c1137f2b7e2b55182
++151a4826c3376fbc19c3428c4f7a70e94af333cc
+151a4826c3376fbc19c3428c4f7a70e94af333cc
+sqlobject_2.2.0.orig.tar.gz
+97208b7d23e66a332157e056d882d044b66c61de
+893989
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Remove-docs-from-installed-files.patch
index 2ac28fe,0000000..10a2d37
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 00ca43b4d372272b3baf10ea6809fb626490233c Mon Sep 17 00:00:00 2001
++From 349bfec553e7893e68c0935c1137f2b7e2b55182 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 31cc9e7..7108b20 100755
++index e8883c6..58968fa 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],
+ scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
+- 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 a35b929,0000000..98c59bd
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 e0d727bfcbd95b74ab68f77c01430bd41646843d Mon Sep 17 00:00:00 2001
++From f70767b8d1e03c1542dc8b3ba24975859049c433 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
+--- 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 99ca213,0000000..a39b284
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 b38efc52f71c05a28f1db4630c8d0a1891bee727 Mon Sep 17 00:00:00 2001
++From f98b93da2330d3dad5dcac864a8bb0b6649d6ea1 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 11d97f6..31cc9e7 100755
++index 75b7e07..e8883c6 100755
+--- a/setup.py
++++ b/setup.py
+@@ -3,14 +3,8 @@
+ from imp import load_source
+ from os.path import abspath, dirname, isfile, 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 dc88805,0000000..ec13bc7
mode 100644,000000..100644
--- a/debian/patches/remove_pkg_resources
+++ b/debian/patches/remove_pkg_resources
@@@ -1,31 -1,0 +1,31 @@@
- From e076c75f541100c439a339e09c73bd96bcf0e208 Mon Sep 17 00:00:00 2001
++From 14bdae4564016a0fb8fdc08568b8b10bf92cd066 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
+--- a/sqlobject/conftest.py
++++ b/sqlobject/conftest.py
+@@ -11,12 +11,6 @@ import py
+ import os
+ import sqlobject
+
+-try:
+- import pkg_resources
+-except ImportError: # Python 2.2
+- pass
+-else:
+- pkg_resources.require('SQLObject')
+
+ connectionShortcuts = {
+ 'mysql': 'mysql://test@localhost/test',
diff --cc debian/patches/replace_sf_logo
index 299520e,0000000..08635cc
mode 100644,000000..100644
--- a/debian/patches/replace_sf_logo
+++ b/debian/patches/replace_sf_logo
@@@ -1,396 -1,0 +1,396 @@@
- From 6df8b2fa22ee64be7093af035666a18645fb7e7b Mon Sep 17 00:00:00 2001
++From 8320cb3faea5e2162082258251c517cb2839fdac 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 19633cf..bb311c7 100644
++index f579d3d..72faf05 100644
+--- a/docs/Authors.txt
++++ b/docs/Authors.txt
- @@ -33,10 +33,6 @@ Contributions have been made by:
- * Gregor Horvath <gh at gregor-horvath.com>
++@@ -34,10 +34,6 @@ Contributions have been made by:
++ * Nathan Edwards <nje5 at georgetown.edu>
+ * Oleg Broytman <phd at phdru.name>
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 817b42a..ad01e7b 100644
++index 9e2eda1..3abce20 100644
+--- a/docs/DeveloperGuide.txt
++++ b/docs/DeveloperGuide.txt
+@@ -191,10 +191,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:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 aa65d31..d905c01 100644
++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:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 c5eb01f..f40ecee 100644
++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:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 76352c2..82e16d1 100644
++index 2997854..0cc052d 100644
+--- a/docs/News.txt
++++ b/docs/News.txt
- @@ -561,10 +561,6 @@ Features & Interface
++@@ -627,10 +627,6 @@ Features & Interface
+
+ .. __: News4.html
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 75e94c1..eca06a1 100644
++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:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 d87cd42..35dbee3 100644
++index f9cf012..35dbee3 100644
+--- a/docs/News2.txt
++++ b/docs/News2.txt
+@@ -597,10 +597,6 @@ Bug Fixes
+
+ .. __: News1.html
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 d69d0ce..c831d0f 100644
++index 840eedd..c831d0f 100644
+--- a/docs/News3.txt
++++ b/docs/News3.txt
+@@ -382,10 +382,6 @@ Bug Fixes
+
+ .. __: News2.html
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 1f62c76..71c1bd4 100644
++index 11f76d4..71c1bd4 100644
+--- a/docs/News4.txt
++++ b/docs/News4.txt
+@@ -323,10 +323,6 @@ Minor features
+
+ .. __: News3.html
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 4aaf45b..165e13a 100644
++index 096b2e7..165e13a 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:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 3d4a8d9..52b4772 100644
++index 59a50f2..667b99b 100644
+--- a/docs/SQLObject.txt
++++ b/docs/SQLObject.txt
+@@ -2082,10 +2082,6 @@ Documentation`_.
+ .. _SQLBuilder: SQLBuilder.html
+ .. _`SQLBuilder Documentation`: SQLBuilder.html
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 eb804a5..feb885a 100644
++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:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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 6880577..115d939 100644
++index 31170c2..115d939 100644
+--- a/docs/TODO.txt
++++ b/docs/TODO.txt
+@@ -133,10 +133,6 @@ TODO
+ * Allow to override ConsoleWriter/LogWriter classes and makeDebugWriter
+ function.
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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/Versioning.txt b/docs/Versioning.txt
- index d420d78..aab3d8e 100644
++index ca16d4f..aab3d8e 100644
+--- a/docs/Versioning.txt
++++ b/docs/Versioning.txt
+@@ -82,10 +82,6 @@ for a versioned class is created. Version tables are not altered when
+ the main table is altered, so if you add a column to your main class,
+ you will need to manually add the column to your version table.
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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/Views.txt b/docs/Views.txt
- index 26db58d..f48c4d8 100644
++index f2cc9cd..f48c4d8 100644
+--- a/docs/Views.txt
++++ b/docs/Views.txt
+@@ -62,10 +62,6 @@ View classes::
+ calls = SQLMultipleJoin('PhoneCall', joinColumn='phoneNumberID')
+ vCalls = SQLMultipleJoin('ViewPhoneCall', joinColumn='phoneNumberID')
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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/community.txt b/docs/community.txt
- index 8d9758b..21454c4 100644
++index 6bcb280..ead7468 100644
+--- a/docs/community.txt
++++ b/docs/community.txt
+@@ -30,10 +30,6 @@ contributors.
+ One can also contribute to `community-editable recipe/documentation site
+ <https://sites.google.com/site/sqlobject/>`_.
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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/download.txt b/docs/download.txt
- index bb1fc22..88bcdb0 100644
++index e556283..ce4f542 100644
+--- a/docs/download.txt
++++ b/docs/download.txt
+@@ -44,10 +44,6 @@ Before switching to git development was performed at the `Subversion
+ <https://subversion.apache.org/>`_ repository that is still located at
+ http://svn.colorstudy.com/SQLObject
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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/index.txt b/docs/index.txt
- index b61229e..d17f1f4 100644
++index f9870bc..d17f1f4 100644
+--- a/docs/index.txt
++++ b/docs/index.txt
+@@ -65,10 +65,6 @@ Here's how you'd use the object::
+ >>> p is p2
+ True
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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/links.txt b/docs/links.txt
- index 33018d5..ed67f9b 100644
++index e31bdb6..a43de2c 100644
+--- a/docs/links.txt
++++ b/docs/links.txt
+@@ -60,10 +60,6 @@ Open Source Projects
+
+ * `Stoq <http://www.stoq.com.br/>`_, an open source retail system.
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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-admin.txt b/docs/sqlobject-admin.txt
- index b4d04ab..7e77555 100644
++index 94a2f21..7e77555 100644
+--- a/docs/sqlobject-admin.txt
++++ b/docs/sqlobject-admin.txt
+@@ -209,10 +209,6 @@ Future
+
+ * A command to trim versions, by merging upgrade scripts.
+
- -.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
- - :target: http://sourceforge.net/projects/sqlobject
++-.. 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
--
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