sqlobject-cvs Mailing List for SQLObject (Page 17)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  b1a11f087f1528dffaa89101ba350442fd355c39 (commit)
       via  1e0f19edf7bda0aa4e460c104b4a3625ba16bfc4 (commit)
       via  9f413031d8c9698b249e124e1cc85a46dda27472 (commit)
      from  183e0fc1e2544f9041a9acc9a54db6ec1f5574ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/b1a11f087f1528dffaa89101ba350442fd355c39

commit b1a11f087f1528dffaa89101ba350442fd355c39
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Jan 2 03:36:13 2015 +0300

    Python 2.6, 2.7 or 3.4+ is required

diff --git a/README.txt b/README.txt
index 35c9556..81952bc 100644
--- a/README.txt
+++ b/README.txt
@@ -7,7 +7,7 @@ classes, and your rows in Python instances.
 
 It currently supports MySQL through the `MySQLdb` package, PostgreSQL
 through the `psycopg` package, SQLite, Firebird, MaxDB (SAP DB), MS SQL
-Sybase and Rdbhost.  Python 2.6, 2.7 or 3.4 is required.
+Sybase and Rdbhost.  Python 2.6, 2.7 or 3.4+ is required.
 
 For more information please see the documentation in
 docs/SQLObject.txt, or online at http://sqlobject.org/
diff --git a/docs/SQLObject.txt b/docs/SQLObject.txt
index 0fe295d..92f78b9 100644
--- a/docs/SQLObject.txt
+++ b/docs/SQLObject.txt
@@ -66,7 +66,7 @@ ADODBAPI_ (Win32).
 .. _FreeTDS: http://www.freetds.org/
 .. _ADODBAPI: http://adodbapi.sourceforge.net/
 
-Python 2.6 or 2.7 is required.
+Python 2.6, 2.7 or 3.4+ is required.
 
 Compared To Other Database Wrappers
 ===================================
diff --git a/setup.py b/setup.py
index 470dc20..5be8fc9 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ more abstract, and provides substantial database independence for
 applications.
 
 Supports MySQL, PostgreSQL, SQLite, Firebird, Sybase, MSSQL and MaxDB (SAPDB).
-Python 2.6, 2.7 or 3.4 is required.
+Python 2.6, 2.7 or 3.4+ is required.
 
 For development see the projects at
 `SourceForge <http://sourceforge.net/projects/sqlobject/>`_
@@ -136,7 +136,7 @@ easy to use and quick to get started with.
 
 It currently supports MySQL through the `MySQLdb` package, PostgreSQL
 through the `psycopg` package, SQLite, Firebird, MaxDB (SAP DB), MS SQL
-Sybase and Rdbhost.  Python 2.6 or 2.7 is required.
+Sybase and Rdbhost.  Python 2.6, 2.7 or 3.4+ is required.
 
 
 Where is SQLObject
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 5fb2883..340b585 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -43,8 +43,9 @@ from sresults import SelectResults
 from util.threadinglocal import local
 
 import sys
-if sys.version_info[:3] < (2, 6, 0):
-    raise ImportError("SQLObject requires Python 2.6 or 2.7")
+if ((sys.version_info[0] == 2) and (sys.version_info[:3] < (2, 6, 0))) \
+or ((sys.version_info[0] == 3) and (sys.version_info[:3] < (3, 4, 0))):
+    raise ImportError("SQLObject requires Python 2.6, 2.7 or 3.4+")
 
 """
 This thread-local storage is needed for RowCreatedSignals. It gathers

http://sourceforge.net/p/sqlobject/sqlobject/ci/1e0f19edf7bda0aa4e460c104b4a3625ba16bfc4

commit 1e0f19edf7bda0aa4e460c104b4a3625ba16bfc4
Merge: 183e0fc 9f41303
Author: Ian Cordasco <sig...@us...>
Date:   Thu Jan 1 18:38:28 2015 -0600

    Merge pull request #7 from sqlobject/python3/except-syntax
    
    Use new-style exception handling syntax


http://sourceforge.net/p/sqlobject/sqlobject/ci/9f413031d8c9698b249e124e1cc85a46dda27472

commit 9f413031d8c9698b249e124e1cc85a46dda27472
Author: Ian Cordasco <gra...@gm...>
Date:   Thu Dec 25 22:26:52 2014 -0600

    Use new-style exception handling syntax

diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index 142c520..0d4a2ce 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -485,7 +485,7 @@ class InheritableSQLObject(SQLObject):
                 try:
                     clause.append(getattr(currentClass.q, name) == value)
                     break
-                except AttributeError, err:
+                except AttributeError as err:
                     pass
                 currentClass = currentClass.sqlmeta.parentClass
             else:
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 4ed836e..5fb2883 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -1097,7 +1097,7 @@ class SQLObject(object):
                         raise TypeError("%s.set() got an unexpected keyword argument %s" % (self.__class__.__name__, name))
                 try:
                     setattr(self, name, value)
-                except AttributeError, e:
+                except AttributeError as e:
                     raise AttributeError('%s (with attribute %r)' % (e, name))
 
             self.sqlmeta.dirty = True
@@ -1135,7 +1135,7 @@ class SQLObject(object):
                         raise TypeError("%s.set() got an unexpected keyword argument %s" % (self.__class__.__name__, name))
                 try:
                     setattr(self, name, value)
-                except AttributeError, e:
+                except AttributeError as e:
                     raise AttributeError('%s (with attribute %r)' % (e, name))
 
             if toUpdate:
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index 7ef787e..94335ca 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -249,7 +249,7 @@ class Command(object):
                 sorter.append((level, cls))
             sorter.sort()
             ordered_classes = [cls for level, cls in sorter]
-        except SQLObjectCircularReferenceError, msg:
+        except SQLObjectCircularReferenceError as msg:
             # Failsafe: return the classes as-is if a circular reference
             # prevented the dependency levels to be calculated.
             print("Warning: a circular reference was detected in the "
@@ -463,11 +463,11 @@ class Command(object):
                 module_name = module_name.replace(os.path.sep,'.')[:-3]
                 try:
                     module = moduleloader.load_module(module_name)
-                except ImportError, err:
+                except ImportError as err:
                     if self.options.verbose:
                         print('Could not import module "%s". Error was : "%s"' % (module_name, err))
                     continue
-                except Exception, exc:
+                except Exception as exc:
                     if self.options.verbose:
                         print('Unknown exception while processing module "%s" : "%s"' % (module_name, exc))
                     continue
@@ -634,7 +634,7 @@ class CommandCreate(Command):
                 if not self.options.simulate:
                     try:
                         soClass._connection.createEmptyDatabase()
-                    except soClass._connection.module.ProgrammingError, e:
+                    except soClass._connection.module.ProgrammingError as e:
                         if str(e).find('already exists') != -1:
                             print('Database already exists')
                         else:
@@ -757,7 +757,7 @@ class CommandStatus(Command):
                     columnsFromSchema_warning = True
                 good += 1
                 continue
-            except AssertionError, e:
+            except AssertionError as e:
                 print('Cannot read db table %s: %s' % (
                     soClass.sqlmeta.table, e))
                 continue
@@ -847,7 +847,7 @@ class CommandExecute(Command):
             print(sql)
         try:
             self.cursor.execute(sql)
-        except Exception, e:
+        except Exception as e:
             if not self.options.verbose:
                 print(sql)
             print("****Error:")
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index df02b9b..87011b2 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -71,7 +71,7 @@ class MySQLConnection(DBAPI):
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
             if self.module.version_info[:3] >= (1, 2, 2):
                 conn.ping(True) # Attempt to reconnect. This setting is persistent.
-        except self.module.OperationalError, e:
+        except self.module.OperationalError as e:
             conninfo = "; used connection string: host=%(host)s, port=%(port)s, db=%(db)s, user=%(user)s" % self.__dict__
             raise OperationalError(ErrorMessage(e, conninfo))
 
@@ -113,7 +113,7 @@ class MySQLConnection(DBAPI):
         for count in range(3):
             try:
                 return cursor.execute(query)
-            except self.module.OperationalError, e:
+            except self.module.OperationalError as e:
                 if e.args[0] in (self.module.constants.CR.SERVER_GONE_ERROR, self.module.constants.CR.SERVER_LOST):
                     if count == 2:
                         raise OperationalError(ErrorMessage(e))
@@ -121,27 +121,27 @@ class MySQLConnection(DBAPI):
                         self.printDebug(conn, str(e), 'ERROR')
                 else:
                     raise OperationalError(ErrorMessage(e))
-            except self.module.IntegrityError, e:
+            except self.module.IntegrityError as e:
                 msg = ErrorMessage(e)
                 if e.args[0] == self.module.constants.ER.DUP_ENTRY:
                     raise DuplicateEntryError(msg)
                 else:
                     raise IntegrityError(msg)
-            except self.module.InternalError, e:
+            except self.module.InternalError as e:
                 raise InternalError(ErrorMessage(e))
-            except self.module.ProgrammingError, e:
+            except self.module.ProgrammingError as e:
                 raise ProgrammingError(ErrorMessage(e))
-            except self.module.DataError, e:
+            except self.module.DataError as e:
                 raise DataError(ErrorMessage(e))
-            except self.module.NotSupportedError, e:
+            except self.module.NotSupportedError as e:
                 raise NotSupportedError(ErrorMessage(e))
-            except self.module.DatabaseError, e:
+            except self.module.DatabaseError as e:
                 raise DatabaseError(ErrorMessage(e))
-            except self.module.InterfaceError, e:
+            except self.module.InterfaceError as e:
                 raise InterfaceError(ErrorMessage(e))
-            except self.module.Warning, e:
+            except self.module.Warning as e:
                 raise Warning(ErrorMessage(e))
-            except self.module.Error, e:
+            except self.module.Error as e:
                 raise Error(ErrorMessage(e))
 
     def _queryInsertID(self, conn, soInstance, id, names, values):
@@ -196,7 +196,7 @@ class MySQLConnection(DBAPI):
             # which is not always True (for an embedded application, e.g.)
             self.query('DESCRIBE %s' % (tableName))
             return True
-        except ProgrammingError, e:
+        except ProgrammingError as e:
             if e[0].code == 1146: # ER_NO_SUCH_TABLE
                 return False
             raise
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index 1f94ee3..6ddb40f 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -142,7 +142,7 @@ class PostgresConnection(DBAPI):
                 conn = self.module.connect(self.dsn)
             else:
                 conn = self.module.connect(**self.dsn_dict)
-        except self.module.OperationalError, e:
+        except self.module.OperationalError as e:
             raise OperationalError(ErrorMessage(e, "used connection string %r" % self.dsn))
 
         # For printDebug in _executeRetry
@@ -162,29 +162,29 @@ class PostgresConnection(DBAPI):
             self.printDebug(conn, query, 'QueryR')
         try:
             return cursor.execute(query)
-        except self.module.OperationalError, e:
+        except self.module.OperationalError as e:
             raise OperationalError(ErrorMessage(e))
-        except self.module.IntegrityError, e:
+        except self.module.IntegrityError as e:
             msg = ErrorMessage(e)
             if e.pgcode == '23505':
                 raise DuplicateEntryError(msg)
             else:
                 raise IntegrityError(msg)
-        except self.module.InternalError, e:
+        except self.module.InternalError as e:
             raise InternalError(ErrorMessage(e))
-        except self.module.ProgrammingError, e:
+        except self.module.ProgrammingError as e:
             raise ProgrammingError(ErrorMessage(e))
-        except self.module.DataError, e:
+        except self.module.DataError as e:
             raise DataError(ErrorMessage(e))
-        except self.module.NotSupportedError, e:
+        except self.module.NotSupportedError as e:
             raise NotSupportedError(ErrorMessage(e))
-        except self.module.DatabaseError, e:
+        except self.module.DatabaseError as e:
             raise DatabaseError(ErrorMessage(e))
-        except self.module.InterfaceError, e:
+        except self.module.InterfaceError as e:
             raise InterfaceError(ErrorMessage(e))
-        except self.module.Warning, e:
+        except self.module.Warning as e:
             raise Warning(ErrorMessage(e))
-        except self.module.Error, e:
+        except self.module.Error as e:
             raise Error(ErrorMessage(e))
 
     def _queryInsertID(self, conn, soInstance, id, names, values):
diff --git a/sqlobject/sqlite/sqliteconnection.py b/sqlobject/sqlite/sqliteconnection.py
index 66a6e04..674543f 100644
--- a/sqlobject/sqlite/sqliteconnection.py
+++ b/sqlobject/sqlite/sqliteconnection.py
@@ -206,30 +206,30 @@ class SQLiteConnection(DBAPI):
             self.printDebug(conn, query, 'QueryR')
         try:
             return cursor.execute(query)
-        except self.module.OperationalError, e:
+        except self.module.OperationalError as e:
             raise OperationalError(ErrorMessage(e))
-        except self.module.IntegrityError, e:
+        except self.module.IntegrityError as e:
             msg = ErrorMessage(e)
             if msg.startswith('column') and msg.endswith('not unique') \
             or msg.startswith('UNIQUE constraint failed:'):
                 raise DuplicateEntryError(msg)
             else:
                 raise IntegrityError(msg)
-        except self.module.InternalError, e:
+        except self.module.InternalError as e:
             raise InternalError(ErrorMessage(e))
-        except self.module.ProgrammingError, e:
+        except self.module.ProgrammingError as e:
             raise ProgrammingError(ErrorMessage(e))
-        except self.module.DataError, e:
+        except self.module.DataError as e:
             raise DataError(ErrorMessage(e))
-        except self.module.NotSupportedError, e:
+        except self.module.NotSupportedError as e:
             raise NotSupportedError(ErrorMessage(e))
-        except self.module.DatabaseError, e:
+        except self.module.DatabaseError as e:
             raise DatabaseError(ErrorMessage(e))
-        except self.module.InterfaceError, e:
+        except self.module.InterfaceError as e:
             raise InterfaceError(ErrorMessage(e))
-        except self.module.Warning, e:
+        except self.module.Warning as e:
             raise Warning(ErrorMessage(e))
-        except self.module.Error, e:
+        except self.module.Error as e:
             raise Error(ErrorMessage(e))
 
     def _queryInsertID(self, conn, soInstance, id, names, values):
diff --git a/sqlobject/tests/dbtest.py b/sqlobject/tests/dbtest.py
index 4467edf..753f950 100644
--- a/sqlobject/tests/dbtest.py
+++ b/sqlobject/tests/dbtest.py
@@ -101,7 +101,7 @@ def getConnectionURI():
 
 try:
     connection = getConnection()
-except Exception, e:
+except Exception as e:
     # At least this module should be importable...
     print("Could not open database: %s" % e, file=sys.stderr)
 
diff --git a/sqlobject/tests/test_exceptions.py b/sqlobject/tests/test_exceptions.py
index 6c37524..0588bbc 100644
--- a/sqlobject/tests/test_exceptions.py
+++ b/sqlobject/tests/test_exceptions.py
@@ -25,7 +25,7 @@ def test_exceptions():
     TestExceptionWithNonexistingTable.setConnection(connection)
     try:
         list(TestExceptionWithNonexistingTable.select())
-    except ProgrammingError, e:
+    except ProgrammingError as e:
         assert e.args[0].code == '42P01'
     else:
         assert False, "DID NOT RAISE"
diff --git a/sqlobject/tests/test_indexes.py b/sqlobject/tests/test_indexes.py
index c665b6d..56e0f31 100644
--- a/sqlobject/tests/test_indexes.py
+++ b/sqlobject/tests/test_indexes.py
@@ -64,28 +64,28 @@ def test_index_get_1():
 
     try:
         print(PersonIndexGet.nameIndex.get(firstName='Graham', lastName='Chapman'))
-    except Exception, e:
+    except Exception as e:
         pass
     else:
         raise AssertError
 
     try:
         print(PersonIndexGet.nameIndex.get('Terry', lastName='Gilliam'))
-    except Exception, e:
+    except Exception as e:
         pass
     else:
         raise AssertError
 
     try:
         print(PersonIndexGet.nameIndex.get('Terry', 'Gilliam', 65))
-    except Exception, e:
+    except Exception as e:
         pass
     else:
         raise AssertError
 
     try:
         print(PersonIndexGet.nameIndex.get('Terry'))
-    except Exception, e:
+    except Exception as e:
         pass
     else:
         raise AssertError
diff --git a/sqlobject/util/moduleloader.py b/sqlobject/util/moduleloader.py
index f64f369..e3f8d29 100644
--- a/sqlobject/util/moduleloader.py
+++ b/sqlobject/util/moduleloader.py
@@ -15,7 +15,7 @@ def load_module_from_name(filename, module_name):
     if not os.path.exists(init_filename):
         try:
             f = open(init_filename, 'w')
-        except (OSError, IOError), e:
+        except (OSError, IOError) as e:
             raise IOError(
                 'Cannot write __init__.py file into directory %s (%s)\n'
                 % (os.path.dirname(filename), e))

-----------------------------------------------------------------------

Summary of changes:
 README.txt                           |    2 +-
 docs/SQLObject.txt                   |    2 +-
 setup.py                             |    4 ++--
 sqlobject/inheritance/__init__.py    |    2 +-
 sqlobject/main.py                    |    9 +++++----
 sqlobject/manager/command.py         |   12 ++++++------
 sqlobject/mysql/mysqlconnection.py   |   24 ++++++++++++------------
 sqlobject/postgres/pgconnection.py   |   22 +++++++++++-----------
 sqlobject/sqlite/sqliteconnection.py |   20 ++++++++++----------
 sqlobject/tests/dbtest.py            |    2 +-
 sqlobject/tests/test_exceptions.py   |    2 +-
 sqlobject/tests/test_indexes.py      |    8 ++++----
 sqlobject/util/moduleloader.py       |    2 +-
 13 files changed, 56 insertions(+), 55 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  183e0fc1e2544f9041a9acc9a54db6ec1f5574ed (commit)
      from  5c19f5671651a944a2b9eeebc82293c71a689499 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/183e0fc1e2544f9041a9acc9a54db6ec1f5574ed

commit 183e0fc1e2544f9041a9acc9a54db6ec1f5574ed
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Jan 2 01:55:05 2015 +0300

    PyDispatcher (>=2.0.4) was made an external dependency

diff --git a/MANIFEST.in b/MANIFEST.in
index 702c17e..3c13468 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,6 @@ include .gitignore docs/.gitignore
 include MANIFEST.in ez_setup.py
 include .travis.yml tox.ini
 include *.txt docs/LICENSE docs/*.txt docs/rebuild
-include sqlobject/include/pydispatch/README.txt
 include sqlobject/maxdb/readme.txt
 recursive-include debian *
 recursive-include docs *.css *.html *.js *.gif *.py
diff --git a/docs/News.txt b/docs/News.txt
index 5c44f0f..249b475 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -10,6 +10,8 @@ News
 SQLObject 3.0.0 (master)
 ========================
 
+* PyDispatcher (>=2.0.4) was made an external dependency.
+
 SQLObject 2.1.0
 ===============
 
diff --git a/setup.py b/setup.py
index b79a210..470dc20 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ versionpath = join(abspath(dirname(__file__)), "sqlobject", "__version__.py")
 load_source("sqlobject_version", versionpath)
 from sqlobject_version import version
 
-subpackages = ['firebird', 'include', 'include.pydispatch',
+subpackages = ['firebird', 'include',
                'inheritance', 'inheritance.tests',
                'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost',
                'sqlite', 'sybase', 'tests', 'util',
@@ -28,7 +28,7 @@ if is_setuptools:
     [paste.filter_app_factory]
     main = sqlobject.wsgi_middleware:make_middleware
     """
-    kw['install_requires'] = ["FormEncode>=1.1.1"]
+    kw['install_requires'] = ["FormEncode>=1.1.1", "PyDispatcher>=2.0.4"]
     kw['extras_require'] = {
         'mysql': ['MySQLdb'],
         'postgresql': ['psycopg'], # or pgdb from PyGreSQL
@@ -102,7 +102,6 @@ and `GitHub <https://github.com/sqlobject>`_.
                         "../docs/html/sqlobject/util/*.html",
                         "../docs/html/sqlobject/versioning/*.html",
                     ],
-                    "sqlobject.include": ["pydispatch/*.txt"],
                     "sqlobject.maxdb": ["readme.txt"],
                    },
       **kw
diff --git a/sqlobject/events.py b/sqlobject/events.py
index c4928bc..a36643c 100644
--- a/sqlobject/events.py
+++ b/sqlobject/events.py
@@ -1,7 +1,7 @@
 from __future__ import print_function
 import sys
 import types
-from sqlobject.include.pydispatch import dispatcher
+from pydispatch import dispatcher
 from weakref import ref
 
 
diff --git a/sqlobject/include/pydispatch/README.txt b/sqlobject/include/pydispatch/README.txt
deleted file mode 100644
index 7064a62..0000000
--- a/sqlobject/include/pydispatch/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-This is from PyDispatcher <http://pydispatcher.sf.net>
-
-It was moved here because installation of PyDispatcher conflicts with
-RuleDispatch (they both use the dispatch top-level module), and I
-thought it would be easier to just put it here.  Also, PyDispatcher is
-small and stable and doesn't need updating often.
-
-If the name conflict is resolved in the future, this package can go
-away.
diff --git a/sqlobject/include/pydispatch/__init__.py b/sqlobject/include/pydispatch/__init__.py
deleted file mode 100644
index b13f5f6..0000000
--- a/sqlobject/include/pydispatch/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""Multi-consumer multi-producer dispatching mechanism
-"""
-__version__ = "2.0.3"
-__author__ = "Patrick K. O'Brien"
-__license__ = "BSD-style, see license.txt for details"
-
diff --git a/sqlobject/include/pydispatch/dispatcher.py b/sqlobject/include/pydispatch/dispatcher.py
deleted file mode 100644
index 9b09503..0000000
--- a/sqlobject/include/pydispatch/dispatcher.py
+++ /dev/null
@@ -1,492 +0,0 @@
-"""Multiple-producer-multiple-consumer signal-dispatching
-
-dispatcher is the core of the PyDispatcher system,
-providing the primary API and the core logic for the
-system.
-
-Module attributes of note:
-
-	Any -- Singleton used to signal either "Any Sender" or
-		"Any Signal".  See documentation of the _Any class.
-	Anonymous -- Singleton used to signal "Anonymous Sender"
-		See documentation of the _Anonymous class.
-
-Internal attributes:
-	WEAKREF_TYPES -- tuple of types/classes which represent
-		weak references to receivers, and thus must be de-
-		referenced on retrieval to retrieve the callable
-		object
-	connections -- { senderkey (id) : { signal : [receivers...]}}
-	senders -- { senderkey (id) : weakref(sender) }
-		used for cleaning up sender references on sender
-		deletion
-	sendersBack -- { receiverkey (id) : [senderkey (id)...] }
-		used for cleaning up receiver references on receiver
-		deletion, (considerably speeds up the cleanup process
-		vs. the original code.)
-"""
-from __future__ import generators
-import weakref
-import saferef, robustapply, errors
-
-__author__ = "Patrick K. O'Brien <po...@or...>"
-__cvsid__ = "$Id: dispatcher.py,v 1.1 2010/03/30 15:45:55 mcfletch Exp $"
-__version__ = "$Revision: 1.1 $"[11:-2]
-
-class _Parameter:
-	"""Used to represent default parameter values."""
-	def __repr__(self):
-		return self.__class__.__name__
-
-class _Any(_Parameter):
-	"""Singleton used to signal either "Any Sender" or "Any Signal"
-
-	The Any object can be used with connect, disconnect,
-	send, or sendExact to signal that the parameter given
-	Any should react to all senders/signals, not just
-	a particular sender/signal.
-	"""
-Any = _Any()
-
-class _Anonymous(_Parameter):
-	"""Singleton used to signal "Anonymous Sender"
-
-	The Anonymous object is used to signal that the sender
-	of a message is not specified (as distinct from being
-	"any sender").  Registering callbacks for Anonymous
-	will only receive messages sent without senders.  Sending
-	with anonymous will only send messages to those receivers
-	registered for Any or Anonymous.
-
-	Note:
-		The default sender for connect is Any, while the
-		default sender for send is Anonymous.  This has
-		the effect that if you do not specify any senders
-		in either function then all messages are routed
-		as though there was a single sender (Anonymous)
-		being used everywhere.
-	"""
-Anonymous = _Anonymous()
-
-WEAKREF_TYPES = (weakref.ReferenceType, saferef.BoundMethodWeakref)
-
-connections = {}
-senders = {}
-sendersBack = {}
-
-
-def connect(receiver, signal=Any, sender=Any, weak=True):
-	"""Connect receiver to sender for signal
-
-	receiver -- a callable Python object which is to receive
-		messages/signals/events.  Receivers must be hashable
-		objects.
-
-		if weak is True, then receiver must be weak-referencable
-		(more precisely saferef.safeRef() must be able to create
-		a reference to the receiver).
-	
-		Receivers are fairly flexible in their specification,
-		as the machinery in the robustApply module takes care
-		of most of the details regarding figuring out appropriate
-		subsets of the sent arguments to apply to a given
-		receiver.
-
-		Note:
-			if receiver is itself a weak reference (a callable),
-			it will be de-referenced by the system's machinery,
-			so *generally* weak references are not suitable as
-			receivers, though some use might be found for the
-			facility whereby a higher-level library passes in
-			pre-weakrefed receiver references.
-
-	signal -- the signal to which the receiver should respond
-	
-		if Any, receiver will receive any signal from the
-		indicated sender (which might also be Any, but is not
-		necessarily Any).
-		
-		Otherwise must be a hashable Python object other than
-		None (DispatcherError raised on None).
-		
-	sender -- the sender to which the receiver should respond
-	
-		if Any, receiver will receive the indicated signals
-		from any sender.
-		
-		if Anonymous, receiver will only receive indicated
-		signals from send/sendExact which do not specify a
-		sender, or specify Anonymous explicitly as the sender.
-
-		Otherwise can be any python object.
-		
-	weak -- whether to use weak references to the receiver
-		By default, the module will attempt to use weak
-		references to the receiver objects.  If this parameter
-		is false, then strong references will be used.
-
-	returns None, may raise DispatcherTypeError
-	"""
-	if signal is None:
-		raise errors.DispatcherTypeError(
-			'Signal cannot be None (receiver=%r sender=%r)'%( receiver,sender)
-		)
-	if weak:
-		receiver = saferef.safeRef(receiver, onDelete=_removeReceiver)
-	senderkey = id(sender)
-	if senderkey in connections:
-		signals = connections[senderkey]
-	else:
-		connections[senderkey] = signals = {}
-	# Keep track of senders for cleanup.
-	# Is Anonymous something we want to clean up?
-	if sender not in (None, Anonymous, Any):
-		def remove(object, senderkey=senderkey):
-			_removeSender(senderkey=senderkey)
-		# Skip objects that can not be weakly referenced, which means
-		# they won't be automatically cleaned up, but that's too bad.
-		try:
-			weakSender = weakref.ref(sender, remove)
-			senders[senderkey] = weakSender
-		except:
-			pass
-		
-	receiverID = id(receiver)
-	# get current set, remove any current references to
-	# this receiver in the set, including back-references
-	if signal in signals:
-		receivers = signals[signal]
-		_removeOldBackRefs(senderkey, signal, receiver, receivers)
-	else:
-		receivers = signals[signal] = []
-	try:
-		current = sendersBack.get( receiverID )
-		if current is None:
-			sendersBack[ receiverID ] = current = []
-		if senderkey not in current:
-			current.append(senderkey)
-	except:
-		pass
-
-	receivers.append(receiver)
-
-
-
-def disconnect(receiver, signal=Any, sender=Any, weak=True):
-	"""Disconnect receiver from sender for signal
-
-	receiver -- the registered receiver to disconnect
-	signal -- the registered signal to disconnect
-	sender -- the registered sender to disconnect
-	weak -- the weakref state to disconnect
-
-	disconnect reverses the process of connect,
-	the semantics for the individual elements are
-	logically equivalent to a tuple of
-	(receiver, signal, sender, weak) used as a key
-	to be deleted from the internal routing tables.
-	(The actual process is slightly more complex
-	but the semantics are basically the same).
-
-	Note:
-		Using disconnect is not required to cleanup
-		routing when an object is deleted, the framework
-		will remove routes for deleted objects
-		automatically.  It's only necessary to disconnect
-		if you want to stop routing to a live object.
-		
-	returns None, may raise DispatcherTypeError or
-		DispatcherKeyError
-	"""
-	if signal is None:
-		raise errors.DispatcherTypeError(
-			'Signal cannot be None (receiver=%r sender=%r)'%( receiver,sender)
-		)
-	if weak: receiver = saferef.safeRef(receiver)
-	senderkey = id(sender)
-	try:
-		signals = connections[senderkey]
-		receivers = signals[signal]
-	except KeyError:
-		raise errors.DispatcherKeyError(
-			"""No receivers found for signal %r from sender %r""" %(
-				signal,
-				sender
-			)
-		)
-	try:
-		# also removes from receivers
-		_removeOldBackRefs(senderkey, signal, receiver, receivers)
-	except ValueError:
-		raise errors.DispatcherKeyError(
-			"""No connection to receiver %s for signal %s from sender %s""" %(
-				receiver,
-				signal,
-				sender
-			)
-		)
-	_cleanupConnections(senderkey, signal)
-
-def getReceivers( sender = Any, signal = Any ):
-	"""Get list of receivers from global tables
-
-	This utility function allows you to retrieve the
-	raw list of receivers from the connections table
-	for the given sender and signal pair.
-
-	Note:
-		there is no guarantee that this is the actual list
-		stored in the connections table, so the value
-		should be treated as a simple iterable/truth value
-		rather than, for instance a list to which you
-		might append new records.
-
-	Normally you would use liveReceivers( getReceivers( ...))
-	to retrieve the actual receiver objects as an iterable
-	object.
-	"""
-	try:
-		return connections[id(sender)][signal]
-	except KeyError:
-		return []
-
-def liveReceivers(receivers):
-	"""Filter sequence of receivers to get resolved, live receivers
-
-	This is a generator which will iterate over
-	the passed sequence, checking for weak references
-	and resolving them, then returning all live
-	receivers.
-	"""
-	for receiver in receivers:
-		if isinstance( receiver, WEAKREF_TYPES):
-			# Dereference the weak reference.
-			receiver = receiver()
-			if receiver is not None:
-				yield receiver
-		else:
-			yield receiver
-
-
-
-def getAllReceivers( sender = Any, signal = Any ):
-	"""Get list of all receivers from global tables
-
-	This gets all receivers which should receive
-	the given signal from sender, each receiver should
-	be produced only once by the resulting generator
-	"""
-	receivers = {}
-	for set in (
-		# Get receivers that receive *this* signal from *this* sender.
-		getReceivers( sender, signal ),
-		# Add receivers that receive *any* signal from *this* sender.
-		getReceivers( sender, Any ),
-		# Add receivers that receive *this* signal from *any* sender.
-		getReceivers( Any, signal ),
-		# Add receivers that receive *any* signal from *any* sender.
-		getReceivers( Any, Any ),
-	):
-		for receiver in set:
-			if receiver: # filter out dead instance-method weakrefs
-				try:
-					if receiver not in receivers:
-						receivers[receiver] = 1
-						yield receiver
-				except TypeError:
-					# dead weakrefs raise TypeError on hash...
-					pass
-
-def send(signal=Any, sender=Anonymous, *arguments, **named):
-	"""Send signal from sender to all connected receivers.
-	
-	signal -- (hashable) signal value, see connect for details
-
-	sender -- the sender of the signal
-	
-		if Any, only receivers registered for Any will receive
-		the message.
-
-		if Anonymous, only receivers registered to receive
-		messages from Anonymous or Any will receive the message
-
-		Otherwise can be any python object (normally one
-		registered with a connect if you actually want
-		something to occur).
-
-	arguments -- positional arguments which will be passed to
-		*all* receivers. Note that this may raise TypeErrors
-		if the receivers do not allow the particular arguments.
-		Note also that arguments are applied before named
-		arguments, so they should be used with care.
-
-	named -- named arguments which will be filtered according
-		to the parameters of the receivers to only provide those
-		acceptable to the receiver.
-
-	Return a list of tuple pairs [(receiver, response), ... ]
-
-	if any receiver raises an error, the error propagates back
-	through send, terminating the dispatch loop, so it is quite
-	possible to not have all receivers called if a raises an
-	error.
-	"""
-	# Call each receiver with whatever arguments it can accept.
-	# Return a list of tuple pairs [(receiver, response), ... ].
-	responses = []
-	for receiver in liveReceivers(getAllReceivers(sender, signal)):
-		response = robustapply.robustApply(
-			receiver,
-			signal=signal,
-			sender=sender,
-			*arguments,
-			**named
-		)
-		responses.append((receiver, response))
-	return responses
-def sendExact( signal=Any, sender=Anonymous, *arguments, **named ):
-	"""Send signal only to those receivers registered for exact message
-
-	sendExact allows for avoiding Any/Anonymous registered
-	handlers, sending only to those receivers explicitly
-	registered for a particular signal on a particular
-	sender.
-	"""
-	responses = []
-	for receiver in liveReceivers(getReceivers(sender, signal)):
-		response = robustapply.robustApply(
-			receiver,
-			signal=signal,
-			sender=sender,
-			*arguments,
-			**named
-		)
-		responses.append((receiver, response))
-	return responses
-	
-
-def _removeReceiver(receiver):
-	"""Remove receiver from connections."""
-	if not sendersBack:
-		# During module cleanup the mapping will be replaced with None
-		return False
-	backKey = id(receiver)
-	try:
-		backSet = sendersBack.pop(backKey)
-	except KeyError:
-		return False 
-	else:
-		for senderkey in backSet:
-			try:
-				signals = connections[senderkey].keys()
-			except KeyError:
-				pass
... 506 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.0 has been updated
       via  1fd5a272b6316f31e3e41898d4614d9710ffe5ca (commit)
       via  ea339a430e7a405078e5d28b79bd3319adab9cea (commit)
       via  2504ac83de701741a703b6adc3d55eda0a5a6524 (commit)
      from  b78d5f641764a884ec8c2bbc4761282a77e1e134 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 MANIFEST.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.1 has been updated
       via  2fb4ff258112fb5e67844101fc3b67ef8caa91ae (commit)
       via  b78d5f641764a884ec8c2bbc4761282a77e1e134 (commit)
       via  42d1709776aa481d58bda2663aff5ea19a856272 (commit)
       via  c8ee606ae289b9a924d1f36f08efd53d9fa23c4b (commit)
       via  5ce86792472056414c020c8d0e9ab2384eb42379 (commit)
       via  196717ad6476e08a56c6ed4b923a2e82f60f3d55 (commit)
       via  eb9b737b26fc44626c6ec351551da5a3d61c9583 (commit)
       via  0d4029bf78984e43e7269a760fc214495c0766fd (commit)
      from  8745b5c54e476df1d13b7f24e51fbb799881136b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/TODO.txt |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  140bb2584b2e87b25b372b9765af30701751128a (commit)
      from  ebffee39af18dfca7d24a8fd1bd0268d88f9dab2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/140bb2584b2e87b25b372b9765af30701751128a

commit 140bb2584b2e87b25b372b9765af30701751128a
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 25 19:23:03 2014 +0300

    Add Python 3.4 to the list of supported versions

diff --git a/README.txt b/README.txt
index 9f9a3c9..35c9556 100644
--- a/README.txt
+++ b/README.txt
@@ -7,7 +7,7 @@ classes, and your rows in Python instances.
 
 It currently supports MySQL through the `MySQLdb` package, PostgreSQL
 through the `psycopg` package, SQLite, Firebird, MaxDB (SAP DB), MS SQL
-Sybase and Rdbhost.  Python 2.6 or 2.7 is required.
+Sybase and Rdbhost.  Python 2.6, 2.7 or 3.4 is required.
 
 For more information please see the documentation in
 docs/SQLObject.txt, or online at http://sqlobject.org/
diff --git a/setup.py b/setup.py
index fb7c03b..91ffdab 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ more abstract, and provides substantial database independence for
 applications.
 
 Supports MySQL, PostgreSQL, SQLite, Firebird, Sybase, MSSQL and MaxDB (SAPDB).
-Python 2.6 or 2.7 is required.
+Python 2.6, 2.7 or 3.4 is required.
 
 For development see the projects at
 `SourceForge <http://sourceforge.net/projects/sqlobject/>`_

-----------------------------------------------------------------------

Summary of changes:
 README.txt |    2 +-
 setup.py   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  ebffee39af18dfca7d24a8fd1bd0268d88f9dab2 (commit)
       via  3c8b6d0daf664c921c3e8ec19fc0b38dcf6509ea (commit)
       via  c7f73aa33560f4c789c6a3bbf8643e77bcbd0239 (commit)
       via  949c93965f1635e3065af0e1725f5611e45dbc4c (commit)
       via  64d1287d98216ca730933e29c56b333ca9891d3e (commit)
       via  8939f190a0ffd3db2bb7a8fa4fe100499fa0c9be (commit)
      from  3cec735a8a887b6e276784e02ef30633dd3e5797 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/ebffee39af18dfca7d24a8fd1bd0268d88f9dab2

commit ebffee39af18dfca7d24a8fd1bd0268d88f9dab2
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 25 19:16:22 2014 +0300

    Ian Cordasco started to work on porting SO to Python 3.4

diff --git a/setup.py b/setup.py
index 3164af8..fb7c03b 100755
--- a/setup.py
+++ b/setup.py
@@ -62,14 +62,15 @@ and `GitHub <https://github.com/sqlobject>`_.
   :target: https://travis-ci.org/sqlobject/sqlobject
 """,
       classifiers=[
-        "Development Status :: 1 - Planning",
+        "Development Status :: 2 - Pre-Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 2 :: Only",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
         "Topic :: Database",
         "Topic :: Database :: Front-Ends",
         "Topic :: Software Development :: Libraries :: Python Modules",
@@ -79,7 +80,7 @@ and `GitHub <https://github.com/sqlobject>`_.
       maintainer="Oleg Broytman",
       maintainer_email="ph...@ph...",
       url="http://sqlobject.org/devel/",
-      download_url="https://pypi.python.org/pypi/SQLObject/%sdev-20141211" % version,
+      download_url="https://pypi.python.org/pypi/SQLObject/%sdev-2014" % version,
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],

http://sourceforge.net/p/sqlobject/sqlobject/ci/3c8b6d0daf664c921c3e8ec19fc0b38dcf6509ea

commit 3c8b6d0daf664c921c3e8ec19fc0b38dcf6509ea
Merge: 3cec735 c7f73aa
Author: Ian Cordasco <sig...@us...>
Date:   Thu Dec 25 09:59:32 2014 -0600

    Merge pull request #1 from sqlobject/feature/tox
    
    Switch to tox


http://sourceforge.net/p/sqlobject/sqlobject/ci/c7f73aa33560f4c789c6a3bbf8643e77bcbd0239

commit c7f73aa33560f4c789c6a3bbf8643e77bcbd0239
Author: Ian Cordasco <gra...@gm...>
Date:   Sun Dec 21 09:38:16 2014 -0600

    Use flake8 instead of just pyflakes

diff --git a/.travis.yml b/.travis.yml
index c0da25a..6cf7e62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ env:
   - TOXENV=py26-sqlite
   - TOXENV=py27-sqlite
   - TOXENV=py34-sqlite
-  - TOXENV=py27-pyflakes
-  - TOXENV=py34-pyflakes
+  - TOXENV=py27-flake8
+  - TOXENV=py34-flake8
 
 install: pip install tox
 
@@ -17,7 +17,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: TOXENV=py34-sqlite
-    - env: TOXENV=py27-pyflakes
-    - env: TOXENV=py34-pyflakes
+    - env: TOXENV=py27-flake8
+    - env: TOXENV=py34-flake8
 
 script: tox -e ${TOXENV}
diff --git a/tox.ini b/tox.ini
index ee4e0e7..48254f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-pyflakes
+envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -60,12 +60,14 @@ commands =
 commands =
     py.test -D sqlite:///tmp/sqlobject_test.sqdb
 
-[testenv:py27-pyflakes]
+[testenv:py27-flake8]
 deps =
-    pyflakes
-commands = pyflakes .
+    flake8
+changedir =
+commands = flake8 sqlobject/
 
-[testenv:py34-pyflakes]
+[testenv:py34-flake8]
 deps =
-    pyflakes
-commands = pyflakes .
+    flake8
+changedir =
+commands = flake8 sqlobject/

http://sourceforge.net/p/sqlobject/sqlobject/ci/949c93965f1635e3065af0e1725f5611e45dbc4c

commit 949c93965f1635e3065af0e1725f5611e45dbc4c
Author: Ian Cordasco <gra...@gm...>
Date:   Sat Dec 20 21:06:06 2014 -0600

    Add pyflakes environments

diff --git a/.travis.yml b/.travis.yml
index f1c7e99..c0da25a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ env:
   - TOXENV=py26-sqlite
   - TOXENV=py27-sqlite
   - TOXENV=py34-sqlite
+  - TOXENV=py27-pyflakes
+  - TOXENV=py34-pyflakes
 
 install: pip install tox
 
@@ -15,5 +17,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: TOXENV=py34-sqlite
+    - env: TOXENV=py27-pyflakes
+    - env: TOXENV=py34-pyflakes
 
 script: tox -e ${TOXENV}
diff --git a/tox.ini b/tox.ini
index 90db37d..ee4e0e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite
+envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-pyflakes
 
 # Base test environment settings
 [testenv]
@@ -59,3 +59,13 @@ commands =
 [testenv:py34-sqlite]
 commands =
     py.test -D sqlite:///tmp/sqlobject_test.sqdb
+
+[testenv:py27-pyflakes]
+deps =
+    pyflakes
+commands = pyflakes .
+
+[testenv:py34-pyflakes]
+deps =
+    pyflakes
+commands = pyflakes .

http://sourceforge.net/p/sqlobject/sqlobject/ci/64d1287d98216ca730933e29c56b333ca9891d3e

commit 64d1287d98216ca730933e29c56b333ca9891d3e
Author: Ian Cordasco <gra...@gm...>
Date:   Sat Dec 20 20:46:20 2014 -0600

    Simplify travis-ci configuration

diff --git a/.travis.yml b/.travis.yml
index 241234c..f1c7e99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,19 @@
 language: python
-python:
-  - "2.6"
-  - "2.7"
 
 env:
-  - DB=mysql
-  - DB=postgres
-  - DB=sqlite
+  - TOXENV=py26-mysql
+  - TOXENV=py27-mysql
+  - TOXENV=py26-postgres
+  - TOXENV=py27-postgres
+  - TOXENV=py26-sqlite
+  - TOXENV=py27-sqlite
+  - TOXENV=py34-sqlite
 
-install:
-  - if [[ $DB == mysql ]]; then pip install --use-mirrors mysql-python; fi;
-  - if [[ $DB == postgres ]]; then pip install --use-mirrors psycopg2; fi;
-  - pip install --use-mirrors pytest 'FormEncode>=1.1.1'
-  - pip install .
+install: pip install tox
 
-before_script:
-  - if [[ $DB == mysql ]]; then mysql -e 'create database sqlobject_test;'; fi;
-  - if [[ $DB == postgres ]]; then psql -c 'create database sqlobject_test;' -U postgres; fi;
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TOXENV=py34-sqlite
 
-script:
-  - cd sqlobject
-  - if [[ $DB == mysql ]]; then py.test -D mysql://root:@localhost/sqlobject_test; fi
-  - if [[ $DB == postgres ]]; then py.test -D postgres://postgres:@localhost/sqlobject_test; fi
-  - if [[ $DB == sqlite ]]; then py.test -D sqlite:///tmp/sqlobject_test.sqdb; fi
+script: tox -e ${TOXENV}

http://sourceforge.net/p/sqlobject/sqlobject/ci/8939f190a0ffd3db2bb7a8fa4fe100499fa0c9be

commit 8939f190a0ffd3db2bb7a8fa4fe100499fa0c9be
Author: Ian Cordasco <gra...@gm...>
Date:   Sat Dec 20 16:26:33 2014 -0600

    Add first pass at tox.ini config file

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..90db37d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,61 @@
+[tox]
+minversion = 1.8
+envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite
+
+# Base test environment settings
+[testenv]
+# Don't fail or warn on uninstalled commands
+whitelist_externals =
+    psql
+    mysql
+# Ensure we cd into sqlobject before running the tests
+changedir = ./sqlobject/
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py34: python3.4
+deps =
+    pytest
+    FormEncode >= 1.1.1
+    mysql: mysql-python
+    postgres: psycopg2
+
+
+# MySQL test environments
+[testenv:py26-mysql]
+commands =
+    mysql -e 'create database sqlobject_test;'
+    py.test -D mysql://root:@localhost/sqlobject_test
+    mysql -e 'drop database sqlobject_test;'
+
+[testenv:py27-mysql]
+commands =
+    mysql -e 'create database sqlobject_test;'
+    py.test -D mysql://root:@localhost/sqlobject_test
+    mysql -e 'drop database sqlobject_test;'
+
+# PostgreSQL test environments
+[testenv:py26-postgres]
+commands =
+    psql -c 'create database sqlobject_test;' -U postgres
+    py.test -D postgres://postgres:@localhost/sqlobject_test
+    psql -c 'drop database sqlobject_test;' -U postgres
+
+[testenv:py27-postgres]
+commands =
+    psql -c 'create database sqlobject_test;' -U postgres
+    py.test -D postgres://postgres:@localhost/sqlobject_test
+    psql -c 'drop database sqlobject_test;' -U postgres
+
+# sqlite test environments
+[testenv:py26-sqlite]
+commands =
+    py.test -D sqlite:///tmp/sqlobject_test.sqdb
+
+[testenv:py27-sqlite]
+commands =
+    py.test -D sqlite:///tmp/sqlobject_test.sqdb
+
+[testenv:py34-sqlite]
+commands =
+    py.test -D sqlite:///tmp/sqlobject_test.sqdb

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml |   36 +++++++++++++---------------
 setup.py    |    7 +++--
 tox.ini     |   73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 22 deletions(-)
 create mode 100644 tox.ini


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  3cec735a8a887b6e276784e02ef30633dd3e5797 (commit)
       via  8745b5c54e476df1d13b7f24e51fbb799881136b (commit)
      from  0f7631a94a3a97fe2fd9cb590240b32b56a85a37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/3cec735a8a887b6e276784e02ef30633dd3e5797

commit 3cec735a8a887b6e276784e02ef30633dd3e5797
Merge: 0f7631a 8745b5c
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Dec 24 19:04:12 2014 +0300

    Merge branch '2.1'


-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt           |    2 ++
 sqlobject/sqlbuilder.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.1 has been updated
       via  8745b5c54e476df1d13b7f24e51fbb799881136b (commit)
      from  d8cc22debdd25ab4955418f59c3fd2bff7d67017 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt           |    2 ++
 sqlobject/sqlbuilder.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  0f7631a94a3a97fe2fd9cb590240b32b56a85a37 (commit)
      from  d8cc22debdd25ab4955418f59c3fd2bff7d67017 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/0f7631a94a3a97fe2fd9cb590240b32b56a85a37

commit 0f7631a94a3a97fe2fd9cb590240b32b56a85a37
Merge: f341506 d8cc22d
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Dec 24 03:41:57 2014 +0300

    Merge branch '2.1'

diff --cc docs/News.txt
index 650932a,f3a8d79..66fd124
--- a/docs/News.txt
+++ b/docs/News.txt
@@@ -7,9 -7,18 +7,21 @@@ New
  
  .. _start:
  
 +SQLObject 3.0.0 (master)
 +========================
 +
+ SQLObject 2.1.0
+ ===============
+ 
+ Minor features
+ --------------
+ 
+ * In queries generated with SQLObject's tables columns are sorted in the
+   order they are declared in the table.
+ 
+ * In queries generated with sqlbuilder's Insert/Update, if values are
+   passed using dictionaries, columns are sorted alphabetically.
+ 
  SQLObject 2.0.0
  ===============
  

-----------------------------------------------------------------------

Summary of changes:
 README.txt               |    4 ++--
 docs/DeveloperGuide.txt  |    2 +-
 docs/News.txt            |    3 +++
 setup.cfg                |    4 ++--
 setup.py                 |    8 ++++----
 sqlobject/__version__.py |    8 ++++----
 6 files changed, 16 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.1 has been created
        at  d8cc22debdd25ab4955418f59c3fd2bff7d67017 (commit)

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  d8cc22debdd25ab4955418f59c3fd2bff7d67017 (commit)
       via  17e72a06ee73c6eaa2b06dfa2fed9666a4134a18 (commit)
       via  01cd128225c689afc5fe3ffdc41d948a7fa0c04f (commit)
      from  f3415066142e7c2c0c7acf74828836b442d68244 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 README.txt                         |    4 ++--
 docs/DeveloperGuide.txt            |    2 +-
 docs/News.txt                      |   13 +++++++++++--
 setup.cfg                          |    4 ++--
 setup.py                           |    8 ++++----
 sqlobject/__version__.py           |    8 ++++----
 sqlobject/main.py                  |   12 +++++++++---
 sqlobject/sqlbuilder.py            |    4 ++--
 sqlobject/tests/test_converters.py |    4 ++--
 sqlobject/tests/test_sqlbuilder.py |    4 ++++
 10 files changed, 41 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.7 has been updated
       via  5ce86792472056414c020c8d0e9ab2384eb42379 (commit)
       via  196717ad6476e08a56c6ed4b923a2e82f60f3d55 (commit)
       via  eb9b737b26fc44626c6ec351551da5a3d61c9583 (commit)
       via  0d4029bf78984e43e7269a760fc214495c0766fd (commit)
      from  f196b17138d7228efa80bec1e77699320c897bb0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/5ce86792472056414c020c8d0e9ab2384eb42379

commit 5ce86792472056414c020c8d0e9ab2384eb42379
Merge: f196b17 196717a
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Dec 24 02:32:26 2014 +0300

    Merge branch '1.6' into 1.7


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.6 has been updated
       via  196717ad6476e08a56c6ed4b923a2e82f60f3d55 (commit)
       via  eb9b737b26fc44626c6ec351551da5a3d61c9583 (commit)
       via  0d4029bf78984e43e7269a760fc214495c0766fd (commit)
      from  6e8d147f054b0ba0616a5a10bffc8b4545a2602d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.5 has been updated
       via  0d4029bf78984e43e7269a760fc214495c0766fd (commit)
      from  5f7bb41e1feafe1804527127ad19c4b83f54bd41 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  f3415066142e7c2c0c7acf74828836b442d68244 (commit)
      from  0af67f5973c8c43d4fb67239779008701a30955a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/f3415066142e7c2c0c7acf74828836b442d68244

commit f3415066142e7c2c0c7acf74828836b442d68244
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Dec 23 08:18:44 2014 +0300

    Add Ian Cordasco

diff --git a/docs/Authors.txt b/docs/Authors.txt
index 87d0b42..b7755e9 100644
--- a/docs/Authors.txt
+++ b/docs/Authors.txt
@@ -29,6 +29,7 @@ Contributions have been made by:
 * Ken Lalonde
 * Andrew Ziem <ahz001 at gmail.com>
 * Andrew Trusty <atrusty at gatech.edu>
+* Ian Cordasco <graffatcolmingov at gmail.com>
 * Oleg Broytman <ph...@ph...>
 
 .. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10

-----------------------------------------------------------------------

Summary of changes:
 docs/Authors.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  0af67f5973c8c43d4fb67239779008701a30955a (commit)
       via  fe9120a39dc2ee8ed2dc3d355f86f8c2c6bcce89 (commit)
       via  197ef89ef7a3b29a85e4fcb3a1c88324ad71756d (commit)
       via  f8143e32c03c327481177c50da656ddbdfdb28aa (commit)
      from  a6c00c586d136ba5621810ac0a68a93ab63709b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/0af67f5973c8c43d4fb67239779008701a30955a

commit 0af67f5973c8c43d4fb67239779008701a30955a
Merge: a6c00c5 fe9120a
Author: Ian Cordasco <sig...@us...>
Date:   Sun Dec 21 20:05:06 2014 -0600

    Merge pull request #2 from sqlobject/feature/use-sorted-list
    
    Sort the column items in DBAPI


http://sourceforge.net/p/sqlobject/sqlobject/ci/fe9120a39dc2ee8ed2dc3d355f86f8c2c6bcce89

commit fe9120a39dc2ee8ed2dc3d355f86f8c2c6bcce89
Author: Ian Cordasco <gra...@gm...>
Date:   Sun Dec 21 19:58:05 2014 -0600

    Further simplify how we construct our data in DBAPI
    
    This is a result of Oleg's feedback on pull request #2

diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index cebe2a1..8593f4b 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -640,23 +640,22 @@ class DBAPI(DBConnection):
 
     def _SO_columnClause(self, soClass, kw):
         ops = {None: "IS"}
-        data = {}
+        data = []
         if 'id' in kw:
-            data[soClass.sqlmeta.idName] = kw.pop('id')
+            data.append((soClass.sqlmeta.idName, kw.pop('id')))
         for soColumn in soClass.sqlmeta.columnList:
             key = soColumn.name
-            col = soClass.sqlmeta.columns[key]
             if key in kw:
-                value = kw.pop(key)
-                if col.from_python:
-                    value = col.from_python(value, sqlbuilder.SQLObjectState(soClass, connection=self))
-                data[col.dbName] = value
-            elif col.foreignName in kw:
-                obj = kw.pop(col.foreignName)
+                val = kw.pop(key)
+                if soColumn.from_python:
+                    val = soColumn.from_python(val, sqlbuilder.SQLObjectState(soClass, connection=self))
+                data.append((soColumn.dbName, val))
+            elif soColumn.foreignName in kw:
+                obj = kw.pop(soColumn.foreignName)
                 if isinstance(obj, main.SQLObject):
-                    data[col.dbName] = obj.id
+                    data.append((soColumn.dbName, obj.id))
                 else:
-                    data[col.dbName] = obj
+                    data.append((soColumn.dbName, obj))
         if kw:
             # pick the first key from kw to use to raise the error,
             raise TypeError, "got an unexpected keyword argument(s): %r" % kw.keys()
@@ -667,7 +666,7 @@ class DBAPI(DBConnection):
             ['%s %s %s' %
              (dbName, ops.get(value, "="), self.sqlrepr(value))
              for dbName, value
-             in data.items()])
+             in data])
 
     def sqlrepr(self, v):
         return sqlrepr(v, self.dbName)

http://sourceforge.net/p/sqlobject/sqlobject/ci/197ef89ef7a3b29a85e4fcb3a1c88324ad71756d

commit 197ef89ef7a3b29a85e4fcb3a1c88324ad71756d
Author: Ian Cordasco <gra...@gm...>
Date:   Sun Dec 21 15:00:03 2014 -0600

    Use columnList instead of sorting alphabetically

diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 5fad639..cebe2a1 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -643,7 +643,9 @@ class DBAPI(DBConnection):
         data = {}
         if 'id' in kw:
             data[soClass.sqlmeta.idName] = kw.pop('id')
-        for key, col in sorted(soClass.sqlmeta.columns.items()):
+        for soColumn in soClass.sqlmeta.columnList:
+            key = soColumn.name
+            col = soClass.sqlmeta.columns[key]
             if key in kw:
                 value = kw.pop(key)
                 if col.from_python:

http://sourceforge.net/p/sqlobject/sqlobject/ci/f8143e32c03c327481177c50da656ddbdfdb28aa

commit f8143e32c03c327481177c50da656ddbdfdb28aa
Author: Ian Cordasco <gra...@gm...>
Date:   Sun Dec 21 13:37:18 2014 -0600

    Sort the column items in DBAPI

diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 1ec8aea..5fad639 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -643,7 +643,7 @@ class DBAPI(DBConnection):
         data = {}
         if 'id' in kw:
             data[soClass.sqlmeta.idName] = kw.pop('id')
-        for key, col in soClass.sqlmeta.columns.items():
+        for key, col in sorted(soClass.sqlmeta.columns.items()):
             if key in kw:
                 value = kw.pop(key)
                 if col.from_python:

-----------------------------------------------------------------------

Summary of changes:
 sqlobject/dbconnection.py |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The annotated tag, 2.0.0 has been created
        at  d76873ac019fdcc003476a52605a6c227e5b14aa (tag)
   tagging  47c57a8b7db7415c6b0a9dabf3fbadb2398f561d (commit)
  replaces  1.7.3
 tagged by  Oleg Broytman
        on  Sat Dec 20 20:51:20 2014 +0300

- Log -----------------------------------------------------------------
Release 2.0.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIbBAABCgAGBQJUlbcYAAoJEG4IC3C2KHsDBxkP+N948KQbbScpqlyPgxGULXFe
KnKG88Cacr/JaGR1iuBK79i6v6Q5q/1Pd6IWYxCLL0nWheZXO0wC9vh1PZB1edbA
20hLDYzUoGwt0eZ+LMO4uO4YSh8MLRVpna8xEKzfud+qcGj6SC8rsuNInSbZiE21
Qui0sX5SvtwlBujcMwJcc+h9z0pCiGPuVoz5Yol5BcCJzrjUJV0v1SWD1QPMxW7y
I377MuRAHx63yMmFWsvX0hOCY+Q0+318NgNdL6GPJjVs/MYMzVCsdOokCkcNXQlu
9bIZ9fpRvnYfS5fsL/4gO5NCw3f4i8VCRzR8dopd3tFrA9qNStQ0uxA1bJhftBd0
qCF2b/g0puzFs1qP/kSARLia1DenqnAVlTB2uF7Bzy0+SWG0T//KmyecQsuSXY/H
7+G+La4OKEMDwxyGmeMpDwTooPKN639KnNSYgZm7OsXueRjE12eToddrynWElljJ
vc/emsvTOQbDXgL3JOro5GHhAaLTcaQtkD4eK1oudQlzZtHAf/KUVBouQ9eucfwM
TXzHNxWv1m67jUxp1NdYa+MvDZggH428fyTcEedVgn/jHPVQPyi0cuX5ges8Wku2
PK1i72Gq8sQV5CLxIlBmnMEs8eYmkr2uWtJG1sTmEX28neCnqYGYj+4rHM9wkU6Z
6O1MsJMAr2upiHxpalc=
=UlQp
-----END PGP SIGNATURE-----

Oleg Broytman (74):
      The next branch will be 2.0
      Update News
      Merge revision 4724 from branch 1.7: Update News
      Merge revisions 4726:4730 from branch 1.7: stop supporting Python 2.5
      Merge revision 4732 from branch 1.7: document sqlhub.doInTransaction
      Merge revision 4734 from branch 1.7: no need to work around a bug in Decimal
      Elaborate warning
      Merge revision 4739 from branch 1.7: replace time.strptime with datetime.strptime
      Merge revision 4741 from branch 1.6: split news into minor features and bugfixes
      Merge revision 4744 from branch 1.6: SQLObject 1.6.0 was released 15 May 2014
      Merge revision 4749 from branch 1.7: upgrade ez_setup to 3.6.0
      Merge revision 4751 from branch 1.7: upgrade ez_setup to 5.0
      Merge revision 4753 from branch 1.7: "upgrade" ez_setup to 5.2
      Merge revision 4755 from branch 1.7: "upgrade" ez_setup to 5.3
      Merge revision 4759 from branch 1.7: update News
      Merge branch '1.7'
      Development switched from Subversion to git
      Merge branch '1.7'
      Change URLs for setuptools/easy_install
      Change git URLs for FormEncode
      Update docs for git
      Merge branch '1.7'
      "Upgrade" ez_setup to 5.4.1
      Release 2.0.0a1
      Remove unused section [easy_install]
      Development was switched from Subversion to git
      Change download URL
      "Upgrade" ez_setup to 5.4.2
      Merge branch '1.7'
      Merge branch '1.7'
      Merge branch '1.7'
      Merge branch '1.7'
      Upgrade ez_setup.py to version 7.0
      Apply patch 112: _fromDatabase and UNIQUE should result in alternateID
      ez_setup was upgrades to 7.0
      Release 2.0.0a2
      Old news were restored back to version 0.2.1
      Add Travis CI config
      Install py.test
      Install FormEncode
      Install itself into site-packages (requires by conftest.py)
      Merge branch '1.7'
      Run tests on all (changed) branches
      Merge branch '1.7'
      Merge branch '1.7'
      Merge branch '1.7'
      Merge branch '1.7'
      Merge branch '1.7'
      Merge branch '1.7'
      Development status: alpha
      Microseconds are not supported by old version of MariaDB and MySQL
      Microseconds on MariaDB and MySQL require special handling
      Skip microseconds test if the database doesn't support microseconds
      Fix a bug: left-pad microseconds with zeroes
      Merge branch '1.7'
      Fix Travis image URL branch
      Merge branch '1.7'
      Restore section [egg_info]
      Merge branch '1.7'
      Merge branch '1.7'
      Release 2.0.0b1
      Fix a bug: remove duplicate [egg_info]
      Fix a bug in test_converter
      Branch 2.0
      Merge branch '1.7' into 2.0
      Merge branch '1.7' into 2.0
      Merge branch '1.7' into 2.0
      Python 2.4 or higher is required
      Merge branch '1.5' into 1.6
      Python 2.5 or higher is required
      Merge branch '1.6' into 1.7
      Python 2.6 or 2.7 is required
      Merge branch '1.7' into 2.0
      Release 2.0.0

-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  a6c00c586d136ba5621810ac0a68a93ab63709b1 (commit)
       via  47c57a8b7db7415c6b0a9dabf3fbadb2398f561d (commit)
      from  0b91be1b428ad21c9bfff95ef547cda1e81db6b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/a6c00c586d136ba5621810ac0a68a93ab63709b1

commit a6c00c586d136ba5621810ac0a68a93ab63709b1
Merge: 0b91be1 47c57a8
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Dec 20 20:54:19 2014 +0300

    Merge branch '2.0'
    
    [skip ci]


-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.0 has been updated
       via  47c57a8b7db7415c6b0a9dabf3fbadb2398f561d (commit)
      from  3b61c32cae4076bab0d16b9a09522fc5b6a8e047 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 README.txt               |    4 ++--
 docs/News.txt            |    2 ++
 setup.cfg                |    4 ++--
 setup.py                 |    4 ++--
 sqlobject/__version__.py |    4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  0b91be1b428ad21c9bfff95ef547cda1e81db6b5 (commit)
       via  3b61c32cae4076bab0d16b9a09522fc5b6a8e047 (commit)
       via  f196b17138d7228efa80bec1e77699320c897bb0 (commit)
       via  76ede34738d5640d41474f4e638c0b971288a824 (commit)
       via  6e8d147f054b0ba0616a5a10bffc8b4545a2602d (commit)
       via  dd4cb1ab2db2909ce6e346357e2dfae1bb4e58c8 (commit)
       via  5f7bb41e1feafe1804527127ad19c4b83f54bd41 (commit)
      from  506f655f448cc8a6a6db92c00937c5651afa9143 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/0b91be1b428ad21c9bfff95ef547cda1e81db6b5

commit 0b91be1b428ad21c9bfff95ef547cda1e81db6b5
Merge: 506f655 3b61c32
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 18 23:28:10 2014 +0300

    Merge branch '2.0'
    
    [skip ci]


-----------------------------------------------------------------------

Summary of changes:
 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.0 has been updated
       via  3b61c32cae4076bab0d16b9a09522fc5b6a8e047 (commit)
       via  f196b17138d7228efa80bec1e77699320c897bb0 (commit)
       via  76ede34738d5640d41474f4e638c0b971288a824 (commit)
       via  6e8d147f054b0ba0616a5a10bffc8b4545a2602d (commit)
       via  dd4cb1ab2db2909ce6e346357e2dfae1bb4e58c8 (commit)
       via  5f7bb41e1feafe1804527127ad19c4b83f54bd41 (commit)
      from  d55d57d5e7ef7f53d59ef7639d5a25ab8e05fc76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.7 has been updated
       via  f196b17138d7228efa80bec1e77699320c897bb0 (commit)
       via  76ede34738d5640d41474f4e638c0b971288a824 (commit)
       via  6e8d147f054b0ba0616a5a10bffc8b4545a2602d (commit)
       via  dd4cb1ab2db2909ce6e346357e2dfae1bb4e58c8 (commit)
       via  5f7bb41e1feafe1804527127ad19c4b83f54bd41 (commit)
      from  9793cb5101e1d3d1da20eab9e9c11130d07dc159 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.6 has been updated
       via  6e8d147f054b0ba0616a5a10bffc8b4545a2602d (commit)
       via  dd4cb1ab2db2909ce6e346357e2dfae1bb4e58c8 (commit)
       via  5f7bb41e1feafe1804527127ad19c4b83f54bd41 (commit)
      from  8334f2223233ebbb9d0090a738a1f0491240b1b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.5 has been updated
       via  5f7bb41e1feafe1804527127ad19c4b83f54bd41 (commit)
      from  12c3551fed18bed9547e5752c1ec947687949214 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The annotated tag, 1.7.3 has been created
        at  668fc22d78f5f2b851501c07a6d1e598aaac0ccc (tag)
   tagging  9793cb5101e1d3d1da20eab9e9c11130d07dc159 (commit)
  replaces  1.7.2
 tagged by  Oleg Broytman
        on  Thu Dec 18 19:55:15 2014 +0300

- Log -----------------------------------------------------------------
Release 1.7.3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCgAGBQJUkwbzAAoJEG4IC3C2KHsDDwkQAKPqjBn4IUlPegVn4yAZ/EX3
ZlyuC3GUIUNjuVFl+xg0sU36AfJPX6IVk1p1jDh+bQnDi2tpp4E5Z9qI3s5Qa24h
8YJQEDm6X395xV89mkiQ2MMFIWewyHB4Jsp/9Rkhwejr3VJtXmhuUXHcIqPPvgsh
RRH2QW1X4kD4GyCPkLaACoIIpmZvNNNBCWlSwWViDzjP3+pDDTQIehmv0671hwzT
b3jo3NxyWeymW3/mBuufTI5oLhQ0dLRGTqjQ2MqhvAyWgASQbJsj9cihMVR6vZye
zp2zI8pzFv49W1PJFGn2+bIChOSxQCsdW00gjVGWYRCCVyekTuyesGO0PQ1YPyHV
n4BsJLd9aCd9HgwNsXGn9t1d4+j76KxBcgzxZfTIjSGfx4NMGzBdb21gu2jNlU57
NVSjxK5x/kZX8Q2xE4fYWApGnFLo1Os+icf54mHrn4FxbXTnBtCPY+zSqCZ+9dza
Ix94wt8huvgjM60sPf2M4OM+ei69Kcv6YI+ET4G9ZyrgxdBezVNL8ci9h0DdALad
mKAyiXjNwpFo379pb8LEu4IWjFHqf3r7mCoeBToxfT/+zwSPJDUBtGYi1TK9phUQ
qKXM1tXyf21mhOHyojZsU7h/3f9cqy4vlowz4w79hhpHSJALRq3bMz7mUXQU8gGq
io7zEe1g6JN6+3i52H2s
=GeqY
-----END PGP SIGNATURE-----

Oleg Broytman (15):
      SQLObject supports Python 2.5+
      Support for Python 2.5 has been declared obsolete
      Change wording: Python 2.4 or higher is required
      Merge branch '1.5' into 1.6
      Merge branch '1.6' into 1.7
      Change wording: Python 2.6 or 2.7 is required
      Visually align URLs
      Explicitly list Python versions 2.4-2.7 in trove classifiers
      Extend bdist_egg: include docs in the egg
      Extend setup.py: include tests into the egg
      SQLObject 1.5.6 was released 18 Dec 2014
      Merge branch '1.5' into 1.6
      SQLObject 1.6.4 was released 18 Dec 2014
      Merge branch '1.6' into 1.7
      Release 1.7.3

-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository