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

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

Author: phd
Date: Sat Nov  5 08:04:54 2011
New Revision: 4472

Log:
Merged revision 4471 from branch 1.2:
sqlobject.__doc__ and main.__doc__ no longer contain version number.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/__init__.py
   SQLObject/trunk/sqlobject/main.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sat Nov  5 08:03:23 2011	(r4471)
+++ SQLObject/trunk/docs/News.txt	Sat Nov  5 08:04:54 2011	(r4472)
@@ -35,6 +35,9 @@
 * A bug caused by psycopg2 recently added a new boolean not callable
   autocommit attribute was fixed.
 
+* sqlobject.__doc__ and main.__doc__ no longer contain version number.
+  Use sqlobject.version or version_info.
+
 SQLObject 1.1.3
 ===============
 

Modified: SQLObject/trunk/sqlobject/__init__.py
==============================================================================
--- SQLObject/trunk/sqlobject/__init__.py	Sat Nov  5 08:03:23 2011	(r4471)
+++ SQLObject/trunk/sqlobject/__init__.py	Sat Nov  5 08:04:54 2011	(r4472)
@@ -1,6 +1,4 @@
-"""
-SQLObject 1.2
-"""
+"""SQLObject"""
 from __version__ import version, version_info
 
 from col import *

Modified: SQLObject/trunk/sqlobject/main.py
==============================================================================
--- SQLObject/trunk/sqlobject/main.py	Sat Nov  5 08:03:23 2011	(r4471)
+++ SQLObject/trunk/sqlobject/main.py	Sat Nov  5 08:04:54 2011	(r4472)
@@ -1,6 +1,6 @@
 """
-SQLObject 1.2
--------------
+SQLObject
+---------
 
 :author: Ian Bicking <ia...@co...>