Changes license to LGPL3 + OpenSSL exception on all source files

ChangeLog

@@ -1,3 +1,9 @@
+2010-02-10  Federico Di Gregorio  <fog@initd.org>
+
+	* License migration: psycopg2 is now LGPL3 + OpenSSL exception.
+
+	* TODO file was never updated so lets remove it.
+
 2010-02-10  Federico Di Gregorio  <fog@initd.org>
 
 	* lib/extras.py: fixed register_tstz_w_secs() error as reported by

LICENSE

@@ -1,24 +1,32 @@
-psycopg and the GPL
-===================
+psycopg2 and the LGPL
+=====================
 
-psycopg is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version. See file COPYING for details.
+psycopg2 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 3 of the License, or
+(at your option) any later version.
 
-As a special exception, specific permission is granted for the GPLed
-code in this distribition to be linked to OpenSSL and PostgreSQL libpq
-without invoking GPL clause 2(b).
+psycopg2 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.
 
-Note that the GPL was chosen to avoid proprietary adapters based on
-psycopg code. Using psycopg in a proprietary product (even bundling
-psycopg with the proprietary product) is fine as long as:
+In addition, as a special exception, the copyright holders give
+permission to link this program with the OpenSSL library (or with
+modified versions of OpenSSL that use the same license as OpenSSL),
+and distribute linked combinations including the two.
 
- 1. psycopg is called from Python only using only the provided API
-    (i.e., no linking with C code and no C modules based on it); and
+You must obey the GNU Lesser General Public License in all respects for
+all of the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. If you delete this exception
+statement from all source files in the program, then also delete it here.
+
+You should have received a copy of the GNU Lesser General Public License
+along with psycopg2 (see the doc/ directory.)
+If not, see <http://www.gnu.org/licenses/>.
 
- 2. all the other points of the GPL are respected (you offer a copy
-    of psycopg's source code, and so on.)
 
 Alternative licenses
 ====================
@@ -44,17 +52,3 @@ psycopg/microprotocol*.{h,c}:
     be misrepresented as being the original software.
 
  3. This notice may not be removed or altered from any source distribution.
-
-psycopg 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 General Public License for more details.
-
-Proprietary licenses
-====================
-
-A non-exclusive license is available for companies that want to include
-psycopg in their proprietary products without respecting the spirit of the
-GPL. The price of the license is one day of development done by the author,
-at the consulting fee he applies to his usual customers at the day of the
-request.

NEWS

@@ -1,3 +1,10 @@
+What's new in psycopg 2.0.14
+----------------------------
+
+* It seems we're now good citizens of the free software ecosystem
+  and that big big big companies and people ranting on the
+  pgsql-hackers mailing list we'll now not dislike us.
+
 What's new in psycopg 2.0.13
 ----------------------------
 

README

@@ -1,28 +1,32 @@
-psycopg - Python-PostgreSQL Database Adapter
+psycopg2 - Python-PostgreSQL Database Adapter
 ********************************************
 
-psycopg is a PostgreSQL database adapter for the Python programming
+psycopg2 is a PostgreSQL database adapter for the Python programming
 language. This is version 2, a complete rewrite of the original code to
 provide new-style classes for connection and cursor objects and other
-sweet candies. Like the original, psycopg 2 was written with the aim of
+sweet candies. Like the original, psycopg2 was written with the aim of
 being very small and fast, and stable as a rock.
 
-psycopg is different from the other database adapter because it was
+psycopg2 is different from the other database adapter because it was
 designed for heavily multi-threaded applications that create and destroy
 lots of cursors and make a conspicuous number of concurrent INSERTs or
-UPDATEs. psycopg 2 also provide full asycronous operations for the really
+UPDATEs. psycopg2 also provide full asycronous operations for the really
 brave programmer.
 
 There are confirmed reports of psycopg 1.x compiling and running on Linux
-and FreeBSD on i386, Solaris, MacOS X and win32 architectures. psycopg 2
+and FreeBSD on i386, Solaris, MacOS X and win32 architectures. psycopg2
 does not introduce build-wise incompatible changes so it should be able to
 compile on all architectures just as its predecessor did.
 
-Now go read the INSTALL file. More information about psycopg extensions to
+Now go read the INSTALL file. More information about psycopg2 extensions to
 the DBAPI-2.0 is available in the files located in the doc/ direcory.
+Example code can be found in the examples/ directory. If you make any changes
+to the code make sure to run the unit tests localed in tests/.
 
-psycopg is free software ("free as in freedom" but I like beer too.)
-Licensing information is available in the LICENSE file.
+psycopg2 is free software ("free as in freedom" but I like beer too.)
+It is licensed under the GNU Lesser General Public License, version 3 or
+later plus an exception to allow OpenSSL (libpq) linking; see LICENSE for
+more details.
 
 
 Contributors

ZPsycopgDA/DA.py

@@ -1,21 +1,19 @@
 # ZPsycopgDA/DA.py - ZPsycopgDA Zope product: Database Connection
 #
-# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
+# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version.
+# psycopg2 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 3 of the License, or
+# (at your option) any later version.
 #
-# Or, at your option this program (ZPsycopgDA) can be distributed under the
-# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
-# http://www.zope.org/Resources/ZPL.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See the LICENSE file for details.
+# psycopg2 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.
+
+# Import modules needed by _psycopg to allow tools like py2exe to do
+# their work without bothering about the module dependencies.
 
 
 ALLOWED_PSYCOPG_VERSIONS = ('2.0.7','2.0.8','2.0.9','2.0.10', '2.0.11', '2.0.12', '2.0.13')

ZPsycopgDA/__init__.py

@@ -1,21 +1,19 @@
 # ZPsycopgDA/__init__.py - ZPsycopgDA Zope product
 #
-# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
+# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version.
+# psycopg2 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 3 of the License, or
+# (at your option) any later version.
 #
-# Or, at your option this program (ZPsycopgDA) can be distributed under the
-# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
-# http://www.zope.org/Resources/ZPL.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See the LICENSE file for details.
+# psycopg2 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.
+
+# Import modules needed by _psycopg to allow tools like py2exe to do
+# their work without bothering about the module dependencies.
 
 __doc__ = "ZPsycopg Database Adapter Registration." 
 __version__ = '2.0'

ZPsycopgDA/db.py

@@ -1,21 +1,19 @@
 # ZPsycopgDA/db.py - query execution
 #
-# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
+# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version.
+# psycopg2 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 3 of the License, or
+# (at your option) any later version.
 #
-# Or, at your option this program (ZPsycopgDA) can be distributed under the
-# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
-# http://www.zope.org/Resources/ZPL.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See the LICENSE file for details.
+# psycopg2 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.
+
+# Import modules needed by _psycopg to allow tools like py2exe to do
+# their work without bothering about the module dependencies.
 
 from Shared.DC.ZRDB.TM import TM
 from Shared.DC.ZRDB import dbi_db

ZPsycopgDA/pool.py

@@ -1,24 +1,22 @@
 # ZPsycopgDA/pool.py - ZPsycopgDA Zope product: connection pooling
 #
-# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
+# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version.
+# psycopg2 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 3 of the License, or
+# (at your option) any later version.
 #
-# Or, at your option this program (ZPsycopgDA) can be distributed under the
-# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
-# http://www.zope.org/Resources/ZPL.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See the LICENSE file for details.
+# psycopg2 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.
+
+# Import modules needed by _psycopg to allow tools like py2exe to do
+# their work without bothering about the module dependencies.
 
-# all the connections are held in a pool of pools, directly accessible by the
-# ZPsycopgDA code in db.py
+# All the connections are held in a pool of pools, directly accessible by the
+# ZPsycopgDA code in db.py.
 
 import threading
 import psycopg2.pool