sqlobject-cvs — CVS notification

[SQL-CVS] r4685 - SQLObject/branches/1.5

[<sub...@co...>]

Author: phd
Date: Wed Dec 18 13:13:21 2013
New Revision: 4685

Log:
Fix doc-dest URLs. Uncomment doc-dest URL for stable branch.

Modified:
   SQLObject/branches/1.5/setup.cfg

Modified: SQLObject/branches/1.5/setup.cfg
==============================================================================
--- SQLObject/branches/1.5/setup.cfg	Tue Dec 17 23:51:22 2013	(r4684)
+++ SQLObject/branches/1.5/setup.cfg	Wed Dec 18 13:13:21 2013	(r4685)
@@ -40,6 +40,6 @@
 make-dirs = 1
 
 ## For live documentation:
-# doc-dest = scp://ianbicking@shell.sf.net/home/groups/s/sq/sqlobject/htdocs/
+doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/
 ## For in-development documentation:
-doc-dest = scp://ianbicking@shell.sf.net/home/groups/s/sq/sqlobject/htdocs/devel/
+# doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/devel/

[SQL-CVS] r4684 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: Tue Dec 17 23:51:22 2013
New Revision: 4684

Log:
TODO: upgrade ez_setup

Modified:
   SQLObject/trunk/docs/TODO.txt

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Tue Dec 17 09:14:06 2013	(r4683)
+++ SQLObject/trunk/docs/TODO.txt	Tue Dec 17 23:51:22 2013	(r4684)
@@ -1,6 +1,8 @@
 TODO
 ----
 
+* Upgrade ez_setup to 1.4.2.
+
 * RelatedJoin.hasOther(otherObject[.id])
 
 * createParamsPre/Post::
@@ -47,7 +49,7 @@
 
 * Stop supporting Python 2.5: remove import sets; use ``with lock``;
   make ConnectionHub a context manager instead of .doInTransaction();
-  replace time.strptime with datetime.strptime. Upgrade setuptools.
+  replace time.strptime with datetime.strptime. Upgrade ez_setup to 2.0+.
 
 * Create JSONCol.
 

[SQL-CVS] r4683 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: Tue Dec 17 09:14:06 2013
New Revision: 4683

Log:
Upgrade setuptools after stopping supporting Python 2.5

Modified:
   SQLObject/trunk/docs/TODO.txt

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Sun Dec 15 08:03:08 2013	(r4682)
+++ SQLObject/trunk/docs/TODO.txt	Tue Dec 17 09:14:06 2013	(r4683)
@@ -47,7 +47,7 @@
 
 * Stop supporting Python 2.5: remove import sets; use ``with lock``;
   make ConnectionHub a context manager instead of .doInTransaction();
-  replace time.strptime with datetime.strptime.
+  replace time.strptime with datetime.strptime. Upgrade setuptools.
 
 * Create JSONCol.
 

[SQL-CVS] r4682 - in SQLObject/tags/1.5.1: . sqlobject

[<sub...@co...>]

Author: phd
Date: Sun Dec 15 08:03:08 2013
New Revision: 4682

Log:
Stable version 1.5.1

Modified:
   SQLObject/tags/1.5.1/README.txt
   SQLObject/tags/1.5.1/setup.cfg
   SQLObject/tags/1.5.1/sqlobject/__version__.py

Modified: SQLObject/tags/1.5.1/README.txt
==============================================================================
--- SQLObject/tags/1.5.1/README.txt	Sun Dec 15 08:01:20 2013	(r4681)
+++ SQLObject/tags/1.5.1/README.txt	Sun Dec 15 08:03:08 2013	(r4682)
@@ -1,5 +1,5 @@
-SQLObject 1.5
-=============
+SQLObject 1.5.1
+===============
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
 mapper, i.e., a library that will wrap your database tables in Python

Modified: SQLObject/tags/1.5.1/setup.cfg
==============================================================================
--- SQLObject/tags/1.5.1/setup.cfg	Sun Dec 15 08:01:20 2013	(r4681)
+++ SQLObject/tags/1.5.1/setup.cfg	Sun Dec 15 08:03:08 2013	(r4682)
@@ -5,10 +5,6 @@
 [easy_install]
 #find_links = http://svn.pythonpaste.org/package_index.html
 
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
 [pudge]
 theme = pythonpaste.org
 docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt

Modified: SQLObject/tags/1.5.1/sqlobject/__version__.py
==============================================================================
--- SQLObject/tags/1.5.1/sqlobject/__version__.py	Sun Dec 15 08:01:20 2013	(r4681)
+++ SQLObject/tags/1.5.1/sqlobject/__version__.py	Sun Dec 15 08:03:08 2013	(r4682)
@@ -1,8 +1,8 @@
 
-version = '1.5'
+version = '1.5.1'
 major   = 1
 minor   = 5
-micro   = 0
-release_level = 'branch'
+micro   = 1
+release_level = 'final'
 serial  = 0
 version_info = (major, minor, micro, release_level, serial)

[SQL-CVS] r4681 - SQLObject/tags/1.5.1

[<sub...@co...>]

Author: phd
Date: Sun Dec 15 08:01:20 2013
New Revision: 4681

Log:
Tagging 1.5.1

Added:
   SQLObject/tags/1.5.1/
      - copied from r4680, SQLObject/branches/1.5/

[SQL-CVS] r4680 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: Sun Dec 15 08:00:37 2013
New Revision: 4680

Log:
Merge revision 4679 from branch 1.5: SQLObject 1.5.1 was released 15 Dec 2013

Modified:
   SQLObject/trunk/docs/News.txt

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sun Dec 15 07:58:10 2013	(r4679)
+++ SQLObject/trunk/docs/News.txt	Sun Dec 15 08:00:37 2013	(r4680)
@@ -23,6 +23,8 @@
 SQLObject 1.5.1
 ===============
 
+Released 15 Dec 2013.
+
 * SQLiteConnection.close() now closes and reopens a connection
   to in-memory database.
 

[SQL-CVS] r4679 - SQLObject/branches/1.5/docs

[<sub...@co...>]

Author: phd
Date: Sun Dec 15 07:58:10 2013
New Revision: 4679

Log:
SQLObject 1.5.1 was released 15 Dec 2013

Modified:
   SQLObject/branches/1.5/docs/News.txt

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Sun Dec  8 08:59:20 2013	(r4678)
+++ SQLObject/branches/1.5/docs/News.txt	Sun Dec 15 07:58:10 2013	(r4679)
@@ -10,6 +10,8 @@
 SQLObject 1.5.1
 ===============
 
+Released 15 Dec 2013.
+
 * SQLiteConnection.close() now closes and reopens a connection
   to in-memory database.
 

[SQL-CVS] r4678 - in SQLObject/trunk: docs sqlobject sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sun Dec  8 08:59:20 2013
New Revision: 4678

Log:
DateTimeCol and TimeCol preserve microseconds

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/docs/TODO.txt
   SQLObject/trunk/sqlobject/col.py
   SQLObject/trunk/sqlobject/converters.py
   SQLObject/trunk/sqlobject/tests/test_converters.py
   SQLObject/trunk/sqlobject/tests/test_datetime.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sun Dec  8 08:57:03 2013	(r4677)
+++ SQLObject/trunk/docs/News.txt	Sun Dec  8 08:59:20 2013	(r4678)
@@ -16,6 +16,10 @@
 * Python 2.4 is no longer supported. The minimal supported version is
   Python 2.5.
 
+* DateTimeCol and TimeCol preserve microseconds. The feature requires
+  Python 2.6+ because in Python 2.5 datetime.strptime doesn't support
+  '%f' format.
+
 SQLObject 1.5.1
 ===============
 

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Sun Dec  8 08:57:03 2013	(r4677)
+++ SQLObject/trunk/docs/TODO.txt	Sun Dec  8 08:59:20 2013	(r4678)
@@ -46,7 +46,8 @@
 * Cache columns in sqlmeta.getColumns(); reset the cache on add/del Column/Join.
 
 * Stop supporting Python 2.5: remove import sets; use ``with lock``;
-  make ConnectionHub a context manager instead of .doInTransaction().
+  make ConnectionHub a context manager instead of .doInTransaction();
+  replace time.strptime with datetime.strptime.
 
 * Create JSONCol.
 

Modified: SQLObject/trunk/sqlobject/col.py
==============================================================================
--- SQLObject/trunk/sqlobject/col.py	Sun Dec  8 08:57:03 2013	(r4677)
+++ SQLObject/trunk/sqlobject/col.py	Sun Dec  8 08:59:20 2013	(r4678)
@@ -20,7 +20,9 @@
 
 from array import array
 from itertools import count
-import re, time
+import re
+import sys
+import time
 try:
     import cPickle as pickle
 except ImportError:
@@ -1098,11 +1100,23 @@
                 else:
                     return datetime.time(value.hour, value.minute, int(value.second))
         try:
-            stime = time.strptime(value, self.format)
+            if self.format.find(".%f") >= 0:
+                if '.' in value:
+                    _value = value.split('.')
+                    microseconds = _value[-1]
+                    if len(microseconds) > 6:
+                        _value[-1] = microseconds[:6]
+                        value = '.'.join(_value)
+                else:
+                    value += '.0'
+            if sys.version_info[:3] < (2, 6, 0): # datetime.strptime in python2.5 doesn't support '%f' format
+                stime = time.strptime(value, self.format)
+                return datetime.datetime(*stime[:6])
+            else:
+                return datetime.datetime.strptime(value, self.format)
         except:
             raise validators.Invalid("expected a date/time string of the '%s' format in the DateTimeCol '%s', got %s %r instead" % \
                 (self.format, self.name, type(value), value), value, state)
-        return datetime.datetime(*stime[:6])
 
     def from_python(self, value, state):
         if value is None:
@@ -1129,11 +1143,25 @@
             elif isinstance(value, datetime.time):
                 return DateTime.Time(value.hour, value.minute, value.second)
             try:
-                stime = time.strptime(value, self.format)
+                if self.format.find(".%f") >= 0:
+                    if '.' in value:
+                        _value = value.split('.')
+                        microseconds = _value[-1]
+                        if len(microseconds) > 6:
+                            _value[-1] = microseconds[:6]
+                            value = '.'.join(_value)
+                    else:
+                        value += '.0'
+                if sys.version_info[:3] < (2, 6, 0): # datetime.strptime in python2.5 doesn't support '%f' format
+                    stime = time.strptime(value, self.format)
+                    return DateTime.mktime(stime)
+                else:
+                    value = datetime.datetime.strptime(value, self.format)
+                    return DateTime.DateTime(value.year, value.month, value.day,
+                        value.hour, value.minute, value.second)
             except:
                 raise validators.Invalid("expected a date/time string of the '%s' format in the DateTimeCol '%s', got %s %r instead" % \
                     (self.format, self.name, type(value), value), value, state)
-            return DateTime.mktime(stime)
 
         def from_python(self, value, state):
             if value is None:
@@ -1146,7 +1174,7 @@
                 (self.name, type(value), value), value, state)
 
 class SODateTimeCol(SOCol):
-    datetimeFormat = '%Y-%m-%d %H:%M:%S'
+    datetimeFormat = '%Y-%m-%d %H:%M:%S.%f'
 
     def __init__(self, **kw):
         datetimeFormat = kw.pop('datetimeFormat', None)
@@ -1277,7 +1305,7 @@
     from_python = to_python
 
 class SOTimeCol(SOCol):
-    timeFormat = '%H:%M:%S'
+    timeFormat = '%H:%M:%S.%f'
 
     def __init__(self, **kw):
         timeFormat = kw.pop('timeFormat', None)

Modified: SQLObject/trunk/sqlobject/converters.py
==============================================================================
--- SQLObject/trunk/sqlobject/converters.py	Sun Dec  8 08:57:03 2013	(r4677)
+++ SQLObject/trunk/sqlobject/converters.py	Sun Dec  8 08:59:20 2013	(r4678)
@@ -7,16 +7,11 @@
 
 
 try:
-    import mx.DateTime.ISO
-    origISOStr = mx.DateTime.ISO.strGMT
     from mx.DateTime import DateTimeType, DateTimeDeltaType
 except ImportError:
     try:
-        import DateTime.ISO
-        origISOStr = DateTime.ISO.strGMT
         from DateTime import DateTimeType, DateTimeDeltaType
     except ImportError:
-        origISOStr = None
         DateTimeType = None
         DateTimeDeltaType = None
 
@@ -41,17 +36,6 @@
     ('\t', '\\t'),
 ]
 
-def isoStr(val):
-    """
-    Gets rid of time zone information
-    (@@: should we convert to GMT?)
-    """
-    val = origISOStr(val)
-    if val.find('+') == -1:
-        return val
-    else:
-        return val[:val.find('+')]
-
 class ConverterRegistry:
 
     def __init__(self):
@@ -133,12 +117,12 @@
 
 if DateTimeType:
     def DateTimeConverter(value, db):
-        return "'%s'" % isoStr(value)
+        return "'%s'" % value.strftime("%Y-%m-%d %H:%M:%S.%s")
 
     registerConverter(DateTimeType, DateTimeConverter)
 
     def TimeConverter(value, db):
-        return "'%s'" % value.strftime("%T")
+        return "'%s'" % value.strftime("%H:%M:%S")
 
     registerConverter(DateTimeDeltaType, TimeConverter)
 
@@ -167,9 +151,9 @@
     registerConverter(time.struct_time, StructTimeConverter)
 
 def DateTimeConverter(value, db):
-    return "'%04d-%02d-%02d %02d:%02d:%02d'" % (
+    return "'%04d-%02d-%02d %02d:%02d:%02d.%d'" % (
         value.year, value.month, value.day,
-        value.hour, value.minute, value.second)
+        value.hour, value.minute, value.second, value.microsecond)
 
 registerConverter(datetime.datetime, DateTimeConverter)
 
@@ -179,7 +163,7 @@
 registerConverter(datetime.date, DateConverter)
 
 def TimeConverter(value, db):
-    return "'%02d:%02d:%02d'" % (value.hour, value.minute, value.second)
+    return "'%02d:%02d:%02d.%d'" % (value.hour, value.minute, value.second, value.microsecond)
 
 registerConverter(datetime.time, TimeConverter)
 

Modified: SQLObject/trunk/sqlobject/tests/test_converters.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_converters.py	Sun Dec  8 08:57:03 2013	(r4677)
+++ SQLObject/trunk/sqlobject/tests/test_converters.py	Sun Dec  8 08:59:20 2013	(r4678)
@@ -88,11 +88,11 @@
 
 def test_datetime():
     from datetime import datetime, date, time
-    assert sqlrepr(datetime(2005, 7, 14, 13, 31, 2)) == "'2005-07-14 13:31:02'"
+    assert sqlrepr(datetime(2005, 7, 14, 13, 31, 2)) == "'2005-07-14 13:31:02.0'"
     assert sqlrepr(date(2005, 7, 14)) == "'2005-07-14'"
-    assert sqlrepr(time(13, 31, 2)) == "'13:31:02'"
+    assert sqlrepr(time(13, 31, 2)) == "'13:31:02.0'"
     # now dates before 1900
-    assert sqlrepr(datetime(1428, 7, 14, 13, 31, 2)) == "'1428-07-14 13:31:02'"
+    assert sqlrepr(datetime(1428, 7, 14, 13, 31, 2)) == "'1428-07-14 13:31:02.0'"
     assert sqlrepr(date(1428, 7, 14)) == "'1428-07-14'"
 
 def test_instance():

Modified: SQLObject/trunk/sqlobject/tests/test_datetime.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_datetime.py	Sun Dec  8 08:57:03 2013	(r4677)
+++ SQLObject/trunk/sqlobject/tests/test_datetime.py	Sun Dec  8 08:59:20 2013	(r4678)
@@ -25,7 +25,8 @@
     assert dt1.col1.day == _now.day
     assert dt1.col1.hour == _now.hour
     assert dt1.col1.minute == _now.minute
-    assert dt1.col1.second == int(_now.second)
+    assert dt1.col1.second == _now.second
+    assert dt1.col1.microsecond == _now.microsecond
 
     assert isinstance(dt1.col2, date)
     assert not isinstance(dt1.col2, datetime)
@@ -36,7 +37,8 @@
     assert isinstance(dt1.col3, time)
     assert dt1.col3.hour == _now.hour
     assert dt1.col3.minute == _now.minute
-    assert dt1.col3.second == int(_now.second)
+    assert dt1.col3.second == _now.second
+    assert dt1.col3.microsecond == _now.microsecond
 
 if mxdatetime_available:
     col.default_datetime_implementation = MXDATETIME_IMPLEMENTATION
@@ -47,7 +49,7 @@
     if connection.dbName == "sqlite":
         if connection.using_sqlite2:
             # mxDateTime sends and PySQLite2 returns full date/time for dates
-            dateFormat = "%Y-%m-%d %H:%M:%S"
+            dateFormat = "%Y-%m-%d %H:%M:%S.%f"
 
     class DateTime2(SQLObject):
         col1 = DateTimeCol()
@@ -57,7 +59,7 @@
     def test_mxDateTime():
         setupClass(DateTime2)
         _now = now()
-        dt2 = DateTime2(col1=_now, col2=_now, col3=Time(_now.hour, _now.minute, int(_now.second)))
+        dt2 = DateTime2(col1=_now, col2=_now, col3=Time(_now.hour, _now.minute, _now.second))
 
         assert isinstance(dt2.col1, col.DateTimeType)
         assert dt2.col1.year == _now.year

[SQL-CVS] r4677 - in SQLObject/trunk: docs sqlobject/sqlite sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sun Dec  8 08:57:03 2013
New Revision: 4677

Log:
Merge revision 4676 from branch 1.5: SQLiteConnection.close()
now closes and reopens a connection to in-memory database.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
   SQLObject/trunk/sqlobject/tests/dbtest.py
   SQLObject/trunk/sqlobject/tests/test_sqlite.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sun Dec  8 08:54:13 2013	(r4676)
+++ SQLObject/trunk/docs/News.txt	Sun Dec  8 08:57:03 2013	(r4677)
@@ -16,6 +16,12 @@
 * Python 2.4 is no longer supported. The minimal supported version is
   Python 2.5.
 
+SQLObject 1.5.1
+===============
+
+* SQLiteConnection.close() now closes and reopens a connection
+  to in-memory database.
+
 SQLObject 1.5.0
 ===============
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Sun Dec  8 08:54:13 2013	(r4676)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Sun Dec  8 08:57:03 2013	(r4677)
@@ -89,11 +89,7 @@
         self._threadPool = {}
         self._threadOrigination = {}
         if self._memory:
-            self._memoryConn = sqlite.connect(
-                self.filename, **self._connOptions)
-            # Convert text data from SQLite to str, not unicode -
-            # SQLObject converts it to unicode itself.
-            self._memoryConn.text_factory = str
+            self.makeMemoryConnection()
 
     @classmethod
     def _connectionFromParams(cls, user, password, host, port, path, args):
@@ -184,6 +180,13 @@
             return
         conn.isolation_level = level
 
+    def makeMemoryConnection(self):
+        self._memoryConn = self.module.connect(
+            self.filename, **self._connOptions)
+        # Convert text data from SQLite to str, not unicode -
+        # SQLObject converts it to unicode itself.
+        self._memoryConn.text_factory = str
+
     def makeConnection(self):
         if self._memory:
             return self._memoryConn
@@ -194,6 +197,9 @@
     def close(self):
         DBAPI.close(self)
         self._threadPool = {}
+        if self._memory:
+            self._memoryConn.close()
+            self.makeMemoryConnection()
 
     def _executeRetry(self, conn, cursor, query):
         if self.debug:

Modified: SQLObject/trunk/sqlobject/tests/dbtest.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/dbtest.py	Sun Dec  8 08:54:13 2013	(r4676)
+++ SQLObject/trunk/sqlobject/tests/dbtest.py	Sun Dec  8 08:57:03 2013	(r4677)
@@ -41,6 +41,7 @@
     '-emptyTable': 'mssql',
     '-limitSelect' : 'mssql',
     '+schema' : 'postgres',
+    '+memorydb': 'sqlite',
     }
 
 

Modified: SQLObject/trunk/sqlobject/tests/test_sqlite.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_sqlite.py	Sun Dec  8 08:54:13 2013	(r4676)
+++ SQLObject/trunk/sqlobject/tests/test_sqlite.py	Sun Dec  8 08:57:03 2013	(r4677)
@@ -104,3 +104,16 @@
     test = TestSO1(name=None, passwd='')
     assert test.name is None
     assert test.passwd == ''
+
+def test_memorydb():
+    if not supports("memorydb"):
+        return
+    connection = getConnection()
+    if connection.dbName != "sqlite":
+        return
+    if not connection._memory:
+        return
+    setupClass(TestSO1)
+    connection.close() # create a new connection to an in-memory database
+    TestSO1.setConnection(connection)
+    TestSO1.createTable()

[SQL-CVS] r4676 - in SQLObject/branches/1.5: docs sqlobject/sqlite sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sun Dec  8 08:54:13 2013
New Revision: 4676

Log:
SQLiteConnection.close() now closes and reopens a connection
to in-memory database.

Modified:
   SQLObject/branches/1.5/docs/News.txt
   SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py
   SQLObject/branches/1.5/sqlobject/tests/dbtest.py
   SQLObject/branches/1.5/sqlobject/tests/test_sqlite.py

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Mon Oct 14 11:16:48 2013	(r4675)
+++ SQLObject/branches/1.5/docs/News.txt	Sun Dec  8 08:54:13 2013	(r4676)
@@ -7,6 +7,12 @@
 
 .. _start:
 
+SQLObject 1.5.1
+===============
+
+* SQLiteConnection.close() now closes and reopens a connection
+  to in-memory database.
+
 SQLObject 1.5.0
 ===============
 

Modified: SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py	Mon Oct 14 11:16:48 2013	(r4675)
+++ SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py	Sun Dec  8 08:54:13 2013	(r4676)
@@ -89,11 +89,7 @@
         self._threadPool = {}
         self._threadOrigination = {}
         if self._memory:
-            self._memoryConn = sqlite.connect(
-                self.filename, **self._connOptions)
-            # Convert text data from SQLite to str, not unicode -
-            # SQLObject converts it to unicode itself.
-            self._memoryConn.text_factory = str
+            self.makeMemoryConnection()
 
     @classmethod
     def _connectionFromParams(cls, user, password, host, port, path, args):
@@ -184,6 +180,13 @@
             return
         conn.isolation_level = level
 
+    def makeMemoryConnection(self):
+        self._memoryConn = self.module.connect(
+            self.filename, **self._connOptions)
+        # Convert text data from SQLite to str, not unicode -
+        # SQLObject converts it to unicode itself.
+        self._memoryConn.text_factory = str
+
     def makeConnection(self):
         if self._memory:
             return self._memoryConn
@@ -194,6 +197,9 @@
     def close(self):
         DBAPI.close(self)
         self._threadPool = {}
+        if self._memory:
+            self._memoryConn.close()
+            self.makeMemoryConnection()
 
     def _executeRetry(self, conn, cursor, query):
         if self.debug:

Modified: SQLObject/branches/1.5/sqlobject/tests/dbtest.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/dbtest.py	Mon Oct 14 11:16:48 2013	(r4675)
+++ SQLObject/branches/1.5/sqlobject/tests/dbtest.py	Sun Dec  8 08:54:13 2013	(r4676)
@@ -41,6 +41,7 @@
     '-emptyTable': 'mssql',
     '-limitSelect' : 'mssql',
     '+schema' : 'postgres',
+    '+memorydb': 'sqlite',
     }
 
 

Modified: SQLObject/branches/1.5/sqlobject/tests/test_sqlite.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_sqlite.py	Mon Oct 14 11:16:48 2013	(r4675)
+++ SQLObject/branches/1.5/sqlobject/tests/test_sqlite.py	Sun Dec  8 08:54:13 2013	(r4676)
@@ -104,3 +104,16 @@
     test = TestSO1(name=None, passwd='')
     assert test.name is None
     assert test.passwd == ''
+
+def test_memorydb():
+    if not supports("memorydb"):
+        return
+    connection = getConnection()
+    if connection.dbName != "sqlite":
+        return
+    if not connection._memory:
+        return
+    setupClass(TestSO1)
+    connection.close() # create a new connection to an in-memory database
+    TestSO1.setConnection(connection)
+    TestSO1.createTable()

[SQL-CVS] r4675 - in SQLObject/trunk: docs sqlobject sqlobject/include sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Mon Oct 14 11:16:48 2013
New Revision: 4675

Log:
Stop supporting Python 2.4; use hashlib instead of md5

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/docs/TODO.txt
   SQLObject/trunk/docs/test.py
   SQLObject/trunk/sqlobject/include/hashcol.py
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/tests/test_md5.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sat Oct 12 11:54:31 2013	(r4674)
+++ SQLObject/trunk/docs/News.txt	Mon Oct 14 11:16:48 2013	(r4675)
@@ -10,6 +10,12 @@
 SQLObject (trunk)
 =================
 
+Features & Interface
+--------------------
+
+* Python 2.4 is no longer supported. The minimal supported version is
+  Python 2.5.
+
 SQLObject 1.5.0
 ===============
 

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Sat Oct 12 11:54:31 2013	(r4674)
+++ SQLObject/trunk/docs/TODO.txt	Mon Oct 14 11:16:48 2013	(r4675)
@@ -45,8 +45,6 @@
 
 * Cache columns in sqlmeta.getColumns(); reset the cache on add/del Column/Join.
 
-* Stop supporting Python 2.4: use hashlib instead of md5.
-
 * Stop supporting Python 2.5: remove import sets; use ``with lock``;
   make ConnectionHub a context manager instead of .doInTransaction().
 

Modified: SQLObject/trunk/docs/test.py
==============================================================================
--- SQLObject/trunk/docs/test.py	Sat Oct 12 11:54:31 2013	(r4674)
+++ SQLObject/trunk/docs/test.py	Mon Oct 14 11:16:48 2013	(r4675)
@@ -1,9 +1,5 @@
 import sys, os
-
-if sys.version_info >= (2, 4):
-    import doctest
-else:
-    raise ImportError("Python 2.4 doctest required")
+import doctest
 
 sys.path.insert(
     0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

Modified: SQLObject/trunk/sqlobject/include/hashcol.py
==============================================================================
--- SQLObject/trunk/sqlobject/include/hashcol.py	Sat Oct 12 11:54:31 2013	(r4674)
+++ SQLObject/trunk/sqlobject/include/hashcol.py	Mon Oct 14 11:16:48 2013	(r4675)
@@ -42,7 +42,7 @@
 
     def __init__( self, **kw ):
         if 'hashMethod' not in kw:
-            from md5 import md5
+            from hashlib import md5
             self.hashMethod = lambda v: md5( v ).hexdigest()
             if 'length' not in kw:
                 kw['length'] = 32

Modified: SQLObject/trunk/sqlobject/main.py
==============================================================================
--- SQLObject/trunk/sqlobject/main.py	Sat Oct 12 11:54:31 2013	(r4674)
+++ SQLObject/trunk/sqlobject/main.py	Mon Oct 14 11:16:48 2013	(r4675)
@@ -43,8 +43,8 @@
 from util.threadinglocal import local
 
 import sys
-if sys.version_info[:3] < (2, 4, 0):
-    raise ImportError, "SQLObject requires Python 2.4.0 or later"
+if sys.version_info[:3] < (2, 5, 0):
+    raise ImportError, "SQLObject requires Python 2.5.0 or later"
 
 """
 This thread-local storage is needed for RowCreatedSignals. It gathers
@@ -648,8 +648,8 @@
     if warnings_level is not None and warnings_level <= level:
         warnings.warn(message, DeprecationWarning, stacklevel=stacklevel)
 
-if sys.version_info[:3] < (2, 5, 0):
-    deprecated("Support for Python 2.4 has been declared obsolete and will be removed in the next release of SQLObject")
+#if sys.version_info[:3] < (2, 5, 0):
+#    deprecated("Support for Python 2.4 has been declared obsolete and will be removed in the next release of SQLObject")
 
 def setDeprecationLevel(warning=1, exception=None):
     """

Modified: SQLObject/trunk/sqlobject/tests/test_md5.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_md5.py	Sat Oct 12 11:54:31 2013	(r4674)
+++ SQLObject/trunk/sqlobject/tests/test_md5.py	Mon Oct 14 11:16:48 2013	(r4675)
@@ -1,7 +1,7 @@
-from md5 import md5
+from hashlib import md5
 
 ########################################
-## md5.md5
+## hashlib.md5
 ########################################
 
 def test_md5():

[SQL-CVS] r4674 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sat Oct 12 11:54:31 2013
New Revision: 4674

Log:
Merge revision 4673 from branch 1.5: add a few tests for md5.md5

Added:
   SQLObject/trunk/sqlobject/tests/test_md5.py
      - copied unchanged from r4673, SQLObject/branches/1.5/sqlobject/tests/test_md5.py

Copied: SQLObject/trunk/sqlobject/tests/test_md5.py (from r4673, SQLObject/branches/1.5/sqlobject/tests/test_md5.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ SQLObject/trunk/sqlobject/tests/test_md5.py	Sat Oct 12 11:54:31 2013	(r4674, copy of r4673, SQLObject/branches/1.5/sqlobject/tests/test_md5.py)
@@ -0,0 +1,11 @@
+from md5 import md5
+
+########################################
+## md5.md5
+########################################
+
+def test_md5():
+    assert md5('').hexdigest() == 'd41d8cd98f00b204e9800998ecf8427e'
+    assert md5('\n').hexdigest() == '68b329da9893e34099c7d8ad5cb9c940'
+    assert md5('123').hexdigest() == '202cb962ac59075b964b07152d234b70'
+    assert md5('123\n').hexdigest() == 'ba1f2511fc30423bdbb183fe33f3dd0f'

[SQL-CVS] r4673 - SQLObject/branches/1.5/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sat Oct 12 11:52:47 2013
New Revision: 4673

Log:
Add a few tests for md5.md5

Added:
   SQLObject/branches/1.5/sqlobject/tests/test_md5.py

Added: SQLObject/branches/1.5/sqlobject/tests/test_md5.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ SQLObject/branches/1.5/sqlobject/tests/test_md5.py	Sat Oct 12 11:52:47 2013	(r4673)
@@ -0,0 +1,11 @@
+from md5 import md5
+
+########################################
+## md5.md5
+########################################
+
+def test_md5():
+    assert md5('').hexdigest() == 'd41d8cd98f00b204e9800998ecf8427e'
+    assert md5('\n').hexdigest() == '68b329da9893e34099c7d8ad5cb9c940'
+    assert md5('123').hexdigest() == '202cb962ac59075b964b07152d234b70'
+    assert md5('123\n').hexdigest() == 'ba1f2511fc30423bdbb183fe33f3dd0f'

[SQL-CVS] r4672 - in SQLObject/tags/1.5.0: . sqlobject

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:37:20 2013
New Revision: 4672

Log:
SQLObject 1.5.0 final

Modified:
   SQLObject/tags/1.5.0/README.txt
   SQLObject/tags/1.5.0/setup.cfg
   SQLObject/tags/1.5.0/sqlobject/__version__.py

Modified: SQLObject/tags/1.5.0/README.txt
==============================================================================
--- SQLObject/tags/1.5.0/README.txt	Sat Oct  5 06:35:39 2013	(r4671)
+++ SQLObject/tags/1.5.0/README.txt	Sat Oct  5 06:37:20 2013	(r4672)
@@ -1,5 +1,5 @@
-SQLObject 1.5
-=============
+SQLObject 1.5.0
+===============
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
 mapper, i.e., a library that will wrap your database tables in Python

Modified: SQLObject/tags/1.5.0/setup.cfg
==============================================================================
--- SQLObject/tags/1.5.0/setup.cfg	Sat Oct  5 06:35:39 2013	(r4671)
+++ SQLObject/tags/1.5.0/setup.cfg	Sat Oct  5 06:37:20 2013	(r4672)
@@ -5,10 +5,6 @@
 [easy_install]
 #find_links = http://svn.pythonpaste.org/package_index.html
 
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
 [pudge]
 theme = pythonpaste.org
 docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt

Modified: SQLObject/tags/1.5.0/sqlobject/__version__.py
==============================================================================
--- SQLObject/tags/1.5.0/sqlobject/__version__.py	Sat Oct  5 06:35:39 2013	(r4671)
+++ SQLObject/tags/1.5.0/sqlobject/__version__.py	Sat Oct  5 06:37:20 2013	(r4672)
@@ -1,8 +1,8 @@
 
-version = '1.5'
+version = '1.5.0'
 major   = 1
 minor   = 5
 micro   = 0
-release_level = 'branch'
+release_level = 'final'
 serial  = 0
 version_info = (major, minor, micro, release_level, serial)

[SQL-CVS] r4671 - SQLObject/tags/1.5.0

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:35:39 2013
New Revision: 4671

Log:
Tagging 1.5.0

Added:
   SQLObject/tags/1.5.0/
      - copied from r4670, SQLObject/branches/1.5/

[SQL-CVS] r4670 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:35:04 2013
New Revision: 4670

Log:
Merge revision 4669 from branch 1.5: SQLObject 1.5.0 was released 5 Oct 2013

Modified:
   SQLObject/trunk/docs/News.txt

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sat Oct  5 06:33:59 2013	(r4669)
+++ SQLObject/trunk/docs/News.txt	Sat Oct  5 06:35:04 2013	(r4670)
@@ -13,6 +13,8 @@
 SQLObject 1.5.0
 ===============
 
+Released 5 Oct 2013.
+
 Features & Interface
 --------------------
 

[SQL-CVS] r4669 - SQLObject/branches/1.5/docs

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:33:59 2013
New Revision: 4669

Log:
SQLObject 1.5.0 was released 5 Oct 2013

Modified:
   SQLObject/branches/1.5/docs/News.txt

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Sat Oct  5 06:31:51 2013	(r4668)
+++ SQLObject/branches/1.5/docs/News.txt	Sat Oct  5 06:33:59 2013	(r4669)
@@ -10,6 +10,8 @@
 SQLObject 1.5.0
 ===============
 
+Released 5 Oct 2013.
+
 Features & Interface
 --------------------
 

[SQL-CVS] r4668 - in SQLObject/trunk: . debian

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:31:51 2013
New Revision: 4668

Log:
Merge revision 4667 from branch 1.5: remove mentions of non-existing examples

Modified:
   SQLObject/trunk/MANIFEST.in
   SQLObject/trunk/debian/examples

Modified: SQLObject/trunk/MANIFEST.in
==============================================================================
--- SQLObject/trunk/MANIFEST.in	Sat Oct  5 06:30:27 2013	(r4667)
+++ SQLObject/trunk/MANIFEST.in	Sat Oct  5 06:31:51 2013	(r4668)
@@ -1,7 +1,6 @@
 include *.txt
 include *.html
 include *.css
-include examples/*.py
 include docs/LICENSE
 include docs/*.txt
 include docs/*.html

Modified: SQLObject/trunk/debian/examples
==============================================================================
--- SQLObject/trunk/debian/examples	Sat Oct  5 06:30:27 2013	(r4667)
+++ SQLObject/trunk/debian/examples	Sat Oct  5 06:31:51 2013	(r4668)
@@ -1,2 +1 @@
-examples/*
 tests/

[SQL-CVS] r4667 - in SQLObject/branches/1.5: . debian

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:30:27 2013
New Revision: 4667

Log:
Remove mentions of non-existing examples directory

Modified:
   SQLObject/branches/1.5/MANIFEST.in
   SQLObject/branches/1.5/debian/examples

Modified: SQLObject/branches/1.5/MANIFEST.in
==============================================================================
--- SQLObject/branches/1.5/MANIFEST.in	Sat Oct  5 06:24:36 2013	(r4666)
+++ SQLObject/branches/1.5/MANIFEST.in	Sat Oct  5 06:30:27 2013	(r4667)
@@ -1,7 +1,6 @@
 include *.txt
 include *.html
 include *.css
-include examples/*.py
 include docs/LICENSE
 include docs/*.txt
 include docs/*.html

Modified: SQLObject/branches/1.5/debian/examples
==============================================================================
--- SQLObject/branches/1.5/debian/examples	Sat Oct  5 06:24:36 2013	(r4666)
+++ SQLObject/branches/1.5/debian/examples	Sat Oct  5 06:30:27 2013	(r4667)
@@ -1,2 +1 @@
-examples/*
 tests/

[SQL-CVS] r4666 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:24:36 2013
New Revision: 4666

Log:
Merge revision 4665 from branch 1.5: add a test for pgcode

Modified:
   SQLObject/trunk/sqlobject/tests/test_exceptions.py

Modified: SQLObject/trunk/sqlobject/tests/test_exceptions.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_exceptions.py	Sat Oct  5 06:23:22 2013	(r4665)
+++ SQLObject/trunk/sqlobject/tests/test_exceptions.py	Sat Oct  5 06:24:36 2013	(r4666)
@@ -1,5 +1,5 @@
 from sqlobject import *
-from sqlobject.dberrors import DuplicateEntryError
+from sqlobject.dberrors import *
 from sqlobject.tests.dbtest import *
 
 ########################################
@@ -9,9 +9,23 @@
 class TestException(SQLObject):
     name = StringCol(unique=True, length=100)
 
+class TestExceptionWithNonexistingTable(SQLObject):
+    pass
+
 def test_exceptions():
     if not supports("exceptions"):
         return
     setupClass(TestException)
     TestException(name="test")
     raises(DuplicateEntryError, TestException, name="test")
+
+    connection = getConnection()
+    if connection.module.__name__ != 'psycopg2':
+        return
+    TestExceptionWithNonexistingTable.setConnection(connection)
+    try:
+        list(TestExceptionWithNonexistingTable.select())
+    except ProgrammingError, e:
+        assert e.args[0].code == '42P01'
+    else:
+        assert False, "DID NOT RAISE"

[SQL-CVS] r4665 - SQLObject/branches/1.5/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:23:22 2013
New Revision: 4665

Log:
Add a test for pgcode

Modified:
   SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py

Modified: SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py	Sat Oct  5 06:04:46 2013	(r4664)
+++ SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py	Sat Oct  5 06:23:22 2013	(r4665)
@@ -1,5 +1,5 @@
 from sqlobject import *
-from sqlobject.dberrors import DuplicateEntryError
+from sqlobject.dberrors import *
 from sqlobject.tests.dbtest import *
 
 ########################################
@@ -9,9 +9,23 @@
 class TestException(SQLObject):
     name = StringCol(unique=True, length=100)
 
+class TestExceptionWithNonexistingTable(SQLObject):
+    pass
+
 def test_exceptions():
     if not supports("exceptions"):
         return
     setupClass(TestException)
     TestException(name="test")
     raises(DuplicateEntryError, TestException, name="test")
+
+    connection = getConnection()
+    if connection.module.__name__ != 'psycopg2':
+        return
+    TestExceptionWithNonexistingTable.setConnection(connection)
+    try:
+        list(TestExceptionWithNonexistingTable.select())
+    except ProgrammingError, e:
+        assert e.args[0].code == '42P01'
+    else:
+        assert False, "DID NOT RAISE"

[SQL-CVS] r4664 - in SQLObject/trunk: . docs sqlobject

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:04:46 2013
New Revision: 4664

Log:
Merged revisions 4662, 4663 from branch 1.5: add GNU LGPL text;
change old FSF address to the new one.

Added:
   SQLObject/trunk/docs/LICENSE
      - copied unchanged from r4663, SQLObject/branches/1.5/docs/LICENSE
Modified:
   SQLObject/trunk/MANIFEST.in
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/sqlbuilder.py

Modified: SQLObject/trunk/MANIFEST.in
==============================================================================
--- SQLObject/trunk/MANIFEST.in	Sat Oct  5 06:01:03 2013	(r4663)
+++ SQLObject/trunk/MANIFEST.in	Sat Oct  5 06:04:46 2013	(r4664)
@@ -2,6 +2,7 @@
 include *.html
 include *.css
 include examples/*.py
+include docs/LICENSE
 include docs/*.txt
 include docs/*.html
 include docs/*.css

Copied: SQLObject/trunk/docs/LICENSE (from r4663, SQLObject/branches/1.5/docs/LICENSE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ SQLObject/trunk/docs/LICENSE	Sat Oct  5 06:04:46 2013	(r4664, copy of r4663, SQLObject/branches/1.5/docs/LICENSE)
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sat Oct  5 06:01:03 2013	(r4663)
+++ SQLObject/trunk/docs/News.txt	Sat Oct  5 06:04:46 2013	(r4664)
@@ -42,6 +42,13 @@
 
 * Fixed parameters for pymssql.
 
+Documentation
+-------------
+
+* GNU LGPL text was added as docs/LICENSE file.
+
+* Old FSF address was changed to the new one.
+
 SQLObject 1.4.1
 ===============
 

Modified: SQLObject/trunk/sqlobject/main.py
==============================================================================
--- SQLObject/trunk/sqlobject/main.py	Sat Oct  5 06:01:03 2013	(r4663)
+++ SQLObject/trunk/sqlobject/main.py	Sat Oct  5 06:04:46 2013	(r4664)
@@ -22,7 +22,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 USA.
 """
 

Modified: SQLObject/trunk/sqlobject/sqlbuilder.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlbuilder.py	Sat Oct  5 06:01:03 2013	(r4663)
+++ SQLObject/trunk/sqlobject/sqlbuilder.py	Sat Oct  5 06:04:46 2013	(r4664)
@@ -21,7 +21,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 USA.
 
 Instructions

[SQL-CVS] r4663 - in SQLObject/branches/1.5: . docs

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 06:01:03 2013
New Revision: 4663

Log:
Add GNU LGPL text as docs/LICENSE file

Added:
   SQLObject/branches/1.5/docs/LICENSE
Modified:
   SQLObject/branches/1.5/MANIFEST.in
   SQLObject/branches/1.5/docs/News.txt

Modified: SQLObject/branches/1.5/MANIFEST.in
==============================================================================
--- SQLObject/branches/1.5/MANIFEST.in	Sat Oct  5 05:56:02 2013	(r4662)
+++ SQLObject/branches/1.5/MANIFEST.in	Sat Oct  5 06:01:03 2013	(r4663)
@@ -2,6 +2,7 @@
 include *.html
 include *.css
 include examples/*.py
+include docs/LICENSE
 include docs/*.txt
 include docs/*.html
 include docs/*.css

Added: SQLObject/branches/1.5/docs/LICENSE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ SQLObject/branches/1.5/docs/LICENSE	Sat Oct  5 06:01:03 2013	(r4663)
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Sat Oct  5 05:56:02 2013	(r4662)
+++ SQLObject/branches/1.5/docs/News.txt	Sat Oct  5 06:01:03 2013	(r4663)
@@ -42,6 +42,8 @@
 Documentation
 -------------
 
+* GNU LGPL text was added as docs/LICENSE file.
+
 * Old FSF address was changed to the new one.
 
 SQLObject 1.4.1

[SQL-CVS] r4662 - in SQLObject/branches/1.5: docs sqlobject

[<sub...@co...>]

Author: phd
Date: Sat Oct  5 05:56:02 2013
New Revision: 4662

Log:
Changed old FSF address to the new one

Modified:
   SQLObject/branches/1.5/docs/News.txt
   SQLObject/branches/1.5/sqlobject/main.py
   SQLObject/branches/1.5/sqlobject/sqlbuilder.py

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Mon Sep 30 08:26:40 2013	(r4661)
+++ SQLObject/branches/1.5/docs/News.txt	Sat Oct  5 05:56:02 2013	(r4662)
@@ -39,6 +39,11 @@
 
 * Fixed parameters for pymssql.
 
+Documentation
+-------------
+
+* Old FSF address was changed to the new one.
+
 SQLObject 1.4.1
 ===============
 

Modified: SQLObject/branches/1.5/sqlobject/main.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/main.py	Mon Sep 30 08:26:40 2013	(r4661)
+++ SQLObject/branches/1.5/sqlobject/main.py	Sat Oct  5 05:56:02 2013	(r4662)
@@ -22,7 +22,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 USA.
 """
 

Modified: SQLObject/branches/1.5/sqlobject/sqlbuilder.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/sqlbuilder.py	Mon Sep 30 08:26:40 2013	(r4661)
+++ SQLObject/branches/1.5/sqlobject/sqlbuilder.py	Sat Oct  5 05:56:02 2013	(r4662)
@@ -21,7 +21,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 USA.
 
 Instructions

[SQL-CVS] r4661 - in SQLObject/trunk: docs sqlobject/postgres

[<sub...@co...>]

Author: phd
Date: Mon Sep 30 08:26:40 2013
New Revision: 4661

Log:
Merged revision 4660 from branch 1.5:

when a PostgresConnection raises an exception the instance has
code/error attributes copied from psycopg2's pgcode/pgerror attributes.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/postgres/pgconnection.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Mon Sep 30 08:09:01 2013	(r4660)
+++ SQLObject/trunk/docs/News.txt	Mon Sep 30 08:26:40 2013	(r4661)
@@ -25,6 +25,9 @@
 Minor features
 --------------
 
+* When a PostgresConnection raises an exception the instance has
+  code/error attributes copied from psycopg2's pgcode/pgerror attributes.
+
 * Encode unicode enum values to str.
 
 * Removed setDeprecationLevel from the list of public functions.

Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py	Mon Sep 30 08:09:01 2013	(r4660)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py	Mon Sep 30 08:26:40 2013	(r4661)
@@ -6,9 +6,13 @@
 from sqlobject.dberrors import *
 
 class ErrorMessage(str):
-    def __new__(cls, e):
-        obj = str.__new__(cls, e[0])
-        obj.code = None
+    def __new__(cls, e, append_msg=''):
+        obj = str.__new__(cls, e[0] + append_msg)
+        if e.__module__ == 'psycopg2':
+            obj.code = getattr(e, 'pgcode', None)
+            obj.error = getattr(e, 'pgerror', None)
+        else:
+            obj.code = obj.error = None
         obj.module = e.__module__
         obj.exception = e.__class__.__name__
         return obj
@@ -139,7 +143,7 @@
             else:
                 conn = self.module.connect(**self.dsn_dict)
         except self.module.OperationalError, e:
-            raise OperationalError("%s; used connection string %r" % (e, self.dsn))
+            raise OperationalError(ErrorMessage(e, "used connection string %r" % self.dsn))
 
         # For printDebug in _executeRetry
         self._connectionNumbers[id(conn)] = self._connectionCount