sqlobject-cvs Mailing List for SQLObject (Page 25)

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

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

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

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

Author: phd
Date: Mon Sep 30 08:09:01 2013
New Revision: 4660

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

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

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Thu Aug 29 14:12:01 2013	(r4659)
+++ SQLObject/branches/1.5/docs/News.txt	Mon Sep 30 08:09:01 2013	(r4660)
@@ -22,6 +22,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/branches/1.5/sqlobject/postgres/pgconnection.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/postgres/pgconnection.py	Thu Aug 29 14:12:01 2013	(r4659)
+++ SQLObject/branches/1.5/sqlobject/postgres/pgconnection.py	Mon Sep 30 08:09:01 2013	(r4660)
@@ -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

Author: phd
Date: Thu Aug 29 14:12:01 2013
New Revision: 4659

Log:
Release 1.5.0rc1

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

Modified: SQLObject/tags/1.5.0rc1/README.txt
==============================================================================
--- SQLObject/tags/1.5.0rc1/README.txt	Thu Aug 29 14:07:06 2013	(r4658)
+++ SQLObject/tags/1.5.0rc1/README.txt	Thu Aug 29 14:12:01 2013	(r4659)
@@ -1,5 +1,5 @@
-SQLObject 1.5
-=============
+SQLObject 1.5.0rc1
+==================
 
 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.0rc1/setup.py
==============================================================================
--- SQLObject/tags/1.5.0rc1/setup.py	Thu Aug 29 14:07:06 2013	(r4658)
+++ SQLObject/tags/1.5.0rc1/setup.py	Thu Aug 29 14:12:01 2013	(r4659)
@@ -56,7 +56,7 @@
       author="Ian Bicking",
       author_email="ia...@co...",
       url="http://sqlobject.org/",
-      download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
+      download_url="https://pypi.python.org/pypi/SQLObject/1.5.0rc1dev-r4659",
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],

Modified: SQLObject/tags/1.5.0rc1/sqlobject/__version__.py
==============================================================================
--- SQLObject/tags/1.5.0rc1/sqlobject/__version__.py	Thu Aug 29 14:07:06 2013	(r4658)
+++ SQLObject/tags/1.5.0rc1/sqlobject/__version__.py	Thu Aug 29 14:12:01 2013	(r4659)
@@ -1,8 +1,8 @@
 
-version = '1.5'
+version = '1.5.0rc1'
 major   = 1
 minor   = 5
 micro   = 0
-release_level = 'branch'
-serial  = 0
+release_level = 'release candidate'
+serial  = 1
 version_info = (major, minor, micro, release_level, serial)

Author: phd
Date: Thu Aug 29 14:07:06 2013
New Revision: 4658

Log:
Tagging 1.5.0rc1

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

Author: phd
Date: Mon Aug 26 13:18:01 2013
New Revision: 4657

Log:
Merged revisions 4654:4656 from branch 1.5

Minor refactoring: slightly reorder some parts of code.
Remove setDeprecationLevel from the list of public functions.
Support for Python 2.4 is declared obsolete.

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

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Mon Aug 26 13:16:22 2013	(r4656)
+++ SQLObject/trunk/docs/News.txt	Mon Aug 26 13:18:01 2013	(r4657)
@@ -19,11 +19,16 @@
 * Helpers for class Outer were changed to lookup columns in table's
   declarations.
 
+* Support for Python 2.4 is declared obsolete and will be removed
+  in the next release.
+
 Minor features
 --------------
 
 * Encode unicode enum values to str.
 
+* Removed setDeprecationLevel from the list of public functions.
+
 * A number of fixes for tests.
 
 Bugfixes

Modified: SQLObject/trunk/sqlobject/main.py
==============================================================================
--- SQLObject/trunk/sqlobject/main.py	Mon Aug 26 13:16:22 2013	(r4656)
+++ SQLObject/trunk/sqlobject/main.py	Mon Aug 26 13:18:01 2013	(r4657)
@@ -51,7 +51,6 @@
 code-blocks to execute _after_ the whole hierachy of inherited SQLObjects
 is created. See SQLObject._create
 """
-_postponed_local = local()
 
 NoDefault = sqlbuilder.NoDefault
 
@@ -632,22 +631,8 @@
 
 sqlhub = dbconnection.ConnectionHub()
 
-class _sqlmeta_attr(object):
-
-    def __init__(self, name, deprecation_level):
-        self.name = name
-        self.deprecation_level = deprecation_level
 
-    def __get__(self, obj, type=None):
-        if self.deprecation_level is not None:
-            deprecated(
-                'Use of this attribute should be replaced with '
-                '.sqlmeta.%s' % self.name, level=self.deprecation_level)
-        return getattr((type or obj).sqlmeta, self.name)
-
-
-# @@: This should become a public interface or documented or
-# something.  Turning it on gives earlier warning about things
+# Turning it on gives earlier warning about things
 # that will be deprecated (having this off we won't flood people
 # with warnings right away).
 warnings_level = 1
@@ -663,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):
     """
@@ -677,12 +662,11 @@
 
     The levels currently mean:
 
-      1) Deprecated in current version (0.9).  Will be removed in next
-         version (0.10)
+      1) Deprecated in current version.  Will be removed in next version.
 
       2) Planned to deprecate in next version, remove later.
 
-      3) Planned to deprecate sometime, remove sometime much later ;)
+      3) Planned to deprecate sometime, remove sometime much later.
 
     As the SQLObject versions progress, the deprecation level of
     specific features will go down, indicating the advancing nature of
@@ -698,6 +682,22 @@
     exception_level = exception
 
 
+class _sqlmeta_attr(object):
+
+    def __init__(self, name, deprecation_level):
+        self.name = name
+        self.deprecation_level = deprecation_level
+
+    def __get__(self, obj, type=None):
+        if self.deprecation_level is not None:
+            deprecated(
+                'Use of this attribute should be replaced with '
+                '.sqlmeta.%s' % self.name, level=self.deprecation_level)
+        return getattr((type or obj).sqlmeta, self.name)
+
+
+_postponed_local = local()
+
 # SQLObject is the superclass for all SQLObject classes, of
 # course.  All the deeper magic is done in MetaSQLObject, and
 # only lesser magic is done here.  All the actual work is done
@@ -1742,7 +1742,7 @@
     else:
         return obj
 
-__all__ = ['NoDefault', 'SQLObject', 'sqlmeta', 'sqlhub',
-           'getID', 'getObject', 'setDeprecationLevel',
-           'SQLObjectNotFound', 'SQLObjectIntegrityError',
+__all__ = ['NoDefault', 'SQLObject',
+           'SQLObjectIntegrityError', 'SQLObjectNotFound',
+           'getID', 'getObject', 'sqlhub', 'sqlmeta',
           ]

Author: phd
Date: Mon Aug 26 13:16:22 2013
New Revision: 4656

Log:
Support for Python 2.4 is declared obsolete

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

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Mon Aug 26 13:13:28 2013	(r4655)
+++ SQLObject/branches/1.5/docs/News.txt	Mon Aug 26 13:16:22 2013	(r4656)
@@ -16,6 +16,9 @@
 * Helpers for class Outer were changed to lookup columns in table's
   declarations.
 
+* Support for Python 2.4 is declared obsolete and will be removed
+  in the next release.
+
 Minor features
 --------------
 

Modified: SQLObject/branches/1.5/sqlobject/main.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/main.py	Mon Aug 26 13:13:28 2013	(r4655)
+++ SQLObject/branches/1.5/sqlobject/main.py	Mon Aug 26 13:16:22 2013	(r4656)
@@ -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):
     """

Author: phd
Date: Mon Aug 26 13:13:28 2013
New Revision: 4655

Log:
Remove setDeprecationLevel from the list of public functions

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

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Mon Aug 26 13:11:05 2013	(r4654)
+++ SQLObject/branches/1.5/docs/News.txt	Mon Aug 26 13:13:28 2013	(r4655)
@@ -21,6 +21,8 @@
 
 * Encode unicode enum values to str.
 
+* Removed setDeprecationLevel from the list of public functions.
+
 * A number of fixes for tests.
 
 Bugfixes

Modified: SQLObject/branches/1.5/sqlobject/main.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/main.py	Mon Aug 26 13:11:05 2013	(r4654)
+++ SQLObject/branches/1.5/sqlobject/main.py	Mon Aug 26 13:13:28 2013	(r4655)
@@ -1744,5 +1744,5 @@
 
 __all__ = ['NoDefault', 'SQLObject',
            'SQLObjectIntegrityError', 'SQLObjectNotFound',
-           'getID', 'getObject', 'setDeprecationLevel', 'sqlhub', 'sqlmeta',
+           'getID', 'getObject', 'sqlhub', 'sqlmeta',
           ]

Author: phd
Date: Mon Aug 26 13:11:05 2013
New Revision: 4654

Log:
Minor refactoring: slightly reorder some parts of code

Modified:
   SQLObject/branches/1.5/sqlobject/main.py

Modified: SQLObject/branches/1.5/sqlobject/main.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/main.py	Tue Aug 20 07:30:31 2013	(r4653)
+++ SQLObject/branches/1.5/sqlobject/main.py	Mon Aug 26 13:11:05 2013	(r4654)
@@ -51,7 +51,6 @@
 code-blocks to execute _after_ the whole hierachy of inherited SQLObjects
 is created. See SQLObject._create
 """
-_postponed_local = local()
 
 NoDefault = sqlbuilder.NoDefault
 
@@ -632,22 +631,8 @@
 
 sqlhub = dbconnection.ConnectionHub()
 
-class _sqlmeta_attr(object):
-
-    def __init__(self, name, deprecation_level):
-        self.name = name
-        self.deprecation_level = deprecation_level
 
-    def __get__(self, obj, type=None):
-        if self.deprecation_level is not None:
-            deprecated(
-                'Use of this attribute should be replaced with '
-                '.sqlmeta.%s' % self.name, level=self.deprecation_level)
-        return getattr((type or obj).sqlmeta, self.name)
-
-
-# @@: This should become a public interface or documented or
-# something.  Turning it on gives earlier warning about things
+# Turning it on gives earlier warning about things
 # that will be deprecated (having this off we won't flood people
 # with warnings right away).
 warnings_level = 1
@@ -677,12 +662,11 @@
 
     The levels currently mean:
 
-      1) Deprecated in current version (0.9).  Will be removed in next
-         version (0.10)
+      1) Deprecated in current version.  Will be removed in next version.
 
       2) Planned to deprecate in next version, remove later.
 
-      3) Planned to deprecate sometime, remove sometime much later ;)
+      3) Planned to deprecate sometime, remove sometime much later.
 
     As the SQLObject versions progress, the deprecation level of
     specific features will go down, indicating the advancing nature of
@@ -698,6 +682,22 @@
     exception_level = exception
 
 
+class _sqlmeta_attr(object):
+
+    def __init__(self, name, deprecation_level):
+        self.name = name
+        self.deprecation_level = deprecation_level
+
+    def __get__(self, obj, type=None):
+        if self.deprecation_level is not None:
+            deprecated(
+                'Use of this attribute should be replaced with '
+                '.sqlmeta.%s' % self.name, level=self.deprecation_level)
+        return getattr((type or obj).sqlmeta, self.name)
+
+
+_postponed_local = local()
+
 # SQLObject is the superclass for all SQLObject classes, of
 # course.  All the deeper magic is done in MetaSQLObject, and
 # only lesser magic is done here.  All the actual work is done
@@ -1742,7 +1742,7 @@
     else:
         return obj
 
-__all__ = ['NoDefault', 'SQLObject', 'sqlmeta', 'sqlhub',
-           'getID', 'getObject', 'setDeprecationLevel',
-           'SQLObjectNotFound', 'SQLObjectIntegrityError',
+__all__ = ['NoDefault', 'SQLObject',
+           'SQLObjectIntegrityError', 'SQLObjectNotFound',
+           'getID', 'getObject', 'setDeprecationLevel', 'sqlhub', 'sqlmeta',
           ]

Author: phd
Date: Tue Aug 20 07:30:31 2013
New Revision: 4653

Log:
Merged revisions 4649:4652 from branch 1.5

Import validators from sqlobject.col, not from formencode.
Add dbEncoding parameter to SOCol. Move getDbEncoding to SOCol.
Encode unicode enum values to str.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/col.py
   SQLObject/trunk/sqlobject/tests/test_enum.py
   SQLObject/trunk/sqlobject/tests/test_validation.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Tue Aug 20 07:28:06 2013	(r4652)
+++ SQLObject/trunk/docs/News.txt	Tue Aug 20 07:30:31 2013	(r4653)
@@ -22,6 +22,8 @@
 Minor features
 --------------
 
+* Encode unicode enum values to str.
+
 * A number of fixes for tests.
 
 Bugfixes

Modified: SQLObject/trunk/sqlobject/col.py
==============================================================================
--- SQLObject/trunk/sqlobject/col.py	Tue Aug 20 07:28:06 2013	(r4652)
+++ SQLObject/trunk/sqlobject/col.py	Tue Aug 20 07:30:31 2013	(r4653)
@@ -25,10 +25,11 @@
     import cPickle as pickle
 except ImportError:
     import pickle
-# Sadly the name "constraints" conflicts with many of the function
-# arguments in this module, so we rename it:
+import weakref
 from formencode import compound, validators
 from classregistry import findClass
+# Sadly the name "constraints" conflicts with many of the function
+# arguments in this module, so we rename it:
 import constraints as constrs
 import sqlbuilder
 from styles import capword
@@ -106,6 +107,7 @@
                  title=None,
                  tags=[],
                  origName=None,
+                 dbEncoding=None,
                  extra_vars=None):
 
         super(SOCol, self).__init__()
@@ -197,6 +199,9 @@
         if validator: _validators.append(validator)
         if validator2: _validators.insert(0, validator2)
         _vlen = len(_validators)
+        if _vlen:
+            for _validator in _validators:
+                _validator.soCol=weakref.proxy(self)
         if _vlen == 0:
             self.validator = None # Set sef.{from,to}_python
         elif _vlen == 1:
@@ -210,6 +215,7 @@
         self.origName = origName or name
         self.title = title
         self.tags = tags
+        self.dbEncoding = dbEncoding
 
         if extra_vars:
             for name, value in extra_vars.items():
@@ -368,6 +374,22 @@
     def __delete__(self, obj):
         raise AttributeError("I can't be deleted from %r" % obj)
 
+    def getDbEncoding(self, state, default='utf-8'):
+        if self.dbEncoding:
+            return self.dbEncoding
+        dbEncoding = state.soObject.sqlmeta.dbEncoding
+        if dbEncoding:
+            return dbEncoding
+        try:
+            connection = state.connection or state.soObject._connection
+        except AttributeError:
+            dbEncoding = None
+        else:
+            dbEncoding = getattr(connection, "dbEncoding", None)
+        if not dbEncoding:
+            dbEncoding = default
+        return dbEncoding
+
 
 class Col(object):
 
@@ -410,6 +432,13 @@
             self._name or '(unnamed)')
 
 
+class SOValidator(validators.Validator):
+    def getDbEncoding(self, state, default='utf-8'):
+        try:
+            return self.dbEncoding
+        except AttributeError:
+            return self.soCol.getDbEncoding(state, default=default)
+
 
 class SOStringLikeCol(SOCol):
     """A common ancestor for SOStringCol and SOUnicodeCol"""
@@ -498,7 +527,7 @@
             return self._sqlType()
 
 
-class StringValidator(validators.Validator):
+class StringValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -507,10 +536,8 @@
             connection = state.connection or state.soObject._connection
             binaryType = connection._binaryType
         except AttributeError:
-            dbEncoding = "ascii"
             binaryType = type(None) # Just a simple workaround
-        else:
-            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
+        dbEncoding = self.getDbEncoding(state, default='ascii')
         if isinstance(value, unicode):
             return value.encode(dbEncoding)
         if self.dataType and isinstance(value, self.dataType):
@@ -544,13 +571,7 @@
         assert db == 'mssql'
         return "N" + sqlbuilder.sqlrepr(self.value, db)
 
-class UnicodeStringValidator(validators.Validator):
-
-    def getDbEncoding(self, state):
-        try:
-            return self.dbEncoding
-        except AttributeError:
-            return self.soCol.getDbEncoding(state)
+class UnicodeStringValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -586,40 +607,20 @@
             (self.name, type(value), value), value, state)
 
 class SOUnicodeCol(SOStringLikeCol):
-    def __init__(self, **kw):
-        self.dbEncoding = kw.pop('dbEncoding', None)
-        super(SOUnicodeCol, self).__init__(**kw)
-
     def _mssqlType(self):
         if self.customSQLType is not None:
             return self.customSQLType
         return 'N' + super(SOUnicodeCol, self)._mssqlType()
 
     def createValidators(self):
-        return [UnicodeStringValidator(name=self.name, soCol=self)] + \
+        return [UnicodeStringValidator(name=self.name)] + \
             super(SOUnicodeCol, self).createValidators()
 
-    def getDbEncoding(self, state):
-        if self.dbEncoding:
-            return self.dbEncoding
-        dbEncoding = state.soObject.sqlmeta.dbEncoding
-        if dbEncoding:
-            return dbEncoding
-        try:
-            connection = state.connection or state.soObject._connection
-        except AttributeError:
-            dbEncoding = None
-        else:
-            dbEncoding = getattr(connection, "dbEncoding", None)
-        if not dbEncoding:
-            dbEncoding = "utf-8"
-        return dbEncoding
-
 class UnicodeCol(Col):
     baseClass = SOUnicodeCol
 
 
-class IntValidator(validators.Validator):
+class IntValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -700,7 +701,7 @@
     baseClass = SOBigIntCol
 
 
-class BoolValidator(validators.Validator):
+class BoolValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -747,7 +748,7 @@
     baseClass = SOBoolCol
 
 
-class FloatValidator(validators.Validator):
+class FloatValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -959,10 +960,13 @@
         super(ForeignKey, self).__init__(foreignKey=foreignKey, **kw)
 
 
-class EnumValidator(validators.Validator):
+class EnumValidator(SOValidator):
 
     def to_python(self, value, state):
         if value in self.enumValues:
+            if isinstance(value, unicode):
+                dbEncoding = self.getDbEncoding(state)
+                value = value.encode(dbEncoding)
             return value
         elif not self.notNone and value is None:
             return None
@@ -1032,7 +1036,7 @@
     baseClass = SOEnumCol
 
 
-class SetValidator(validators.Validator):
+class SetValidator(SOValidator):
     """
     Translates Python tuples into SQL comma-delimited SET strings.
     """
@@ -1330,7 +1334,7 @@
     baseClass = SOTimestampCol
 
 
-class TimedeltaValidator(validators.Validator):
+class TimedeltaValidator(SOValidator):
     def to_python(self, value, state):
         return value
 
@@ -1350,7 +1354,7 @@
 
 from decimal import Decimal
 
-class DecimalValidator(validators.Validator):
+class DecimalValidator(SOValidator):
     def to_python(self, value, state):
         if value is None:
             return None
@@ -1475,7 +1479,7 @@
     baseClass = SODecimalStringCol
 
 
-class BinaryValidator(validators.Validator):
+class BinaryValidator(SOValidator):
     """
     Validator for binary types.
 
@@ -1566,12 +1570,7 @@
         if value is None:
             return None
         if isinstance(value, unicode):
-            try:
-                connection = state.connection or state.soObject._connection
-            except AttributeError:
-                dbEncoding = "ascii"
-            else:
-                dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
+            dbEncoding = self.getDbEncoding(state, default='ascii')
             value = value.encode(dbEncoding)
         if isinstance(value, str):
             return pickle.loads(value)

Modified: SQLObject/trunk/sqlobject/tests/test_enum.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_enum.py	Tue Aug 20 07:28:06 2013	(r4652)
+++ SQLObject/trunk/sqlobject/tests/test_enum.py	Tue Aug 20 07:30:31 2013	(r4653)
@@ -1,6 +1,6 @@
 from sqlobject import *
+from sqlobject.col import validators
 from sqlobject.tests.dbtest import *
-from formencode import Invalid
 
 ########################################
 ## Enum test
@@ -17,9 +17,10 @@
     raises(
         (Enum1._connection.module.IntegrityError,
          Enum1._connection.module.ProgrammingError,
-         Invalid),
+         validators.Invalid),
         Enum1, l='b')
 
+
 class EnumWithNone(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None])
@@ -30,6 +31,7 @@
         e = EnumWithNone(l=l)
         assert e.l == l
 
+
 class EnumWithDefaultNone(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None], default=None)
@@ -40,6 +42,7 @@
     e = EnumWithDefaultNone()
     assert e.l == None
 
+
 class EnumWithDefaultOther(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None], default='a')
@@ -49,3 +52,17 @@
 
     e = EnumWithDefaultOther()
     assert e.l == 'a'
+
+
+class EnumUnicode(SQLObject):
+
+    n = UnicodeCol()
+    l = EnumCol(enumValues=['a', 'b'])
+
+def testUnicode():
+    setupClass(EnumUnicode)
+
+    EnumUnicode(n=u'a', l='a')
+    EnumUnicode(n=u'b', l=u'b')
+    EnumUnicode(n=u'\u201c', l='a')
+    EnumUnicode(n=u'\u201c', l=u'b')

Modified: SQLObject/trunk/sqlobject/tests/test_validation.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_validation.py	Tue Aug 20 07:28:06 2013	(r4652)
+++ SQLObject/trunk/sqlobject/tests/test_validation.py	Tue Aug 20 07:30:31 2013	(r4653)
@@ -1,6 +1,6 @@
 from sqlobject import *
+from sqlobject.col import validators
 from sqlobject.tests.dbtest import *
-from formencode import validators
 
 ########################################
 ## Validation/conversion

Author: phd
Date: Tue Aug 20 07:28:06 2013
New Revision: 4652

Log:
Update News

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

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Tue Aug 20 07:25:18 2013	(r4651)
+++ SQLObject/branches/1.5/docs/News.txt	Tue Aug 20 07:28:06 2013	(r4652)
@@ -19,6 +19,8 @@
 Minor features
 --------------
 
+* Encode unicode enum values to str.
+
 * A number of fixes for tests.
 
 Bugfixes

Author: phd
Date: Tue Aug 20 07:25:18 2013
New Revision: 4651

Log:
Encode unicode enum values to str

Modified:
   SQLObject/branches/1.5/sqlobject/col.py
   SQLObject/branches/1.5/sqlobject/tests/test_enum.py

Modified: SQLObject/branches/1.5/sqlobject/col.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/col.py	Tue Aug 20 07:21:21 2013	(r4650)
+++ SQLObject/branches/1.5/sqlobject/col.py	Tue Aug 20 07:25:18 2013	(r4651)
@@ -964,6 +964,9 @@
 
     def to_python(self, value, state):
         if value in self.enumValues:
+            if isinstance(value, unicode):
+                dbEncoding = self.getDbEncoding(state)
+                value = value.encode(dbEncoding)
             return value
         elif not self.notNone and value is None:
             return None

Modified: SQLObject/branches/1.5/sqlobject/tests/test_enum.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_enum.py	Tue Aug 20 07:21:21 2013	(r4650)
+++ SQLObject/branches/1.5/sqlobject/tests/test_enum.py	Tue Aug 20 07:25:18 2013	(r4651)
@@ -52,3 +52,17 @@
 
     e = EnumWithDefaultOther()
     assert e.l == 'a'
+
+
+class EnumUnicode(SQLObject):
+
+    n = UnicodeCol()
+    l = EnumCol(enumValues=['a', 'b'])
+
+def testUnicode():
+    setupClass(EnumUnicode)
+
+    EnumUnicode(n=u'a', l='a')
+    EnumUnicode(n=u'b', l=u'b')
+    EnumUnicode(n=u'\u201c', l='a')
+    EnumUnicode(n=u'\u201c', l=u'b')

Author: phd
Date: Tue Aug 20 07:21:21 2013
New Revision: 4650

Log:
Add dbEncoding parameter to SOCol. Move getDbEncoding to SOCol.

Modified:
   SQLObject/branches/1.5/sqlobject/col.py

Modified: SQLObject/branches/1.5/sqlobject/col.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/col.py	Tue Aug 20 07:18:31 2013	(r4649)
+++ SQLObject/branches/1.5/sqlobject/col.py	Tue Aug 20 07:21:21 2013	(r4650)
@@ -25,10 +25,11 @@
     import cPickle as pickle
 except ImportError:
     import pickle
-# Sadly the name "constraints" conflicts with many of the function
-# arguments in this module, so we rename it:
+import weakref
 from formencode import compound, validators
 from classregistry import findClass
+# Sadly the name "constraints" conflicts with many of the function
+# arguments in this module, so we rename it:
 import constraints as constrs
 import sqlbuilder
 from styles import capword
@@ -106,6 +107,7 @@
                  title=None,
                  tags=[],
                  origName=None,
+                 dbEncoding=None,
                  extra_vars=None):
 
         super(SOCol, self).__init__()
@@ -197,6 +199,9 @@
         if validator: _validators.append(validator)
         if validator2: _validators.insert(0, validator2)
         _vlen = len(_validators)
+        if _vlen:
+            for _validator in _validators:
+                _validator.soCol=weakref.proxy(self)
         if _vlen == 0:
             self.validator = None # Set sef.{from,to}_python
         elif _vlen == 1:
@@ -210,6 +215,7 @@
         self.origName = origName or name
         self.title = title
         self.tags = tags
+        self.dbEncoding = dbEncoding
 
         if extra_vars:
             for name, value in extra_vars.items():
@@ -368,6 +374,22 @@
     def __delete__(self, obj):
         raise AttributeError("I can't be deleted from %r" % obj)
 
+    def getDbEncoding(self, state, default='utf-8'):
+        if self.dbEncoding:
+            return self.dbEncoding
+        dbEncoding = state.soObject.sqlmeta.dbEncoding
+        if dbEncoding:
+            return dbEncoding
+        try:
+            connection = state.connection or state.soObject._connection
+        except AttributeError:
+            dbEncoding = None
+        else:
+            dbEncoding = getattr(connection, "dbEncoding", None)
+        if not dbEncoding:
+            dbEncoding = default
+        return dbEncoding
+
 
 class Col(object):
 
@@ -410,6 +432,13 @@
             self._name or '(unnamed)')
 
 
+class SOValidator(validators.Validator):
+    def getDbEncoding(self, state, default='utf-8'):
+        try:
+            return self.dbEncoding
+        except AttributeError:
+            return self.soCol.getDbEncoding(state, default=default)
+
 
 class SOStringLikeCol(SOCol):
     """A common ancestor for SOStringCol and SOUnicodeCol"""
@@ -498,7 +527,7 @@
             return self._sqlType()
 
 
-class StringValidator(validators.Validator):
+class StringValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -507,10 +536,8 @@
             connection = state.connection or state.soObject._connection
             binaryType = connection._binaryType
         except AttributeError:
-            dbEncoding = "ascii"
             binaryType = type(None) # Just a simple workaround
-        else:
-            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
+        dbEncoding = self.getDbEncoding(state, default='ascii')
         if isinstance(value, unicode):
             return value.encode(dbEncoding)
         if self.dataType and isinstance(value, self.dataType):
@@ -544,13 +571,7 @@
         assert db == 'mssql'
         return "N" + sqlbuilder.sqlrepr(self.value, db)
 
-class UnicodeStringValidator(validators.Validator):
-
-    def getDbEncoding(self, state):
-        try:
-            return self.dbEncoding
-        except AttributeError:
-            return self.soCol.getDbEncoding(state)
+class UnicodeStringValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -586,40 +607,20 @@
             (self.name, type(value), value), value, state)
 
 class SOUnicodeCol(SOStringLikeCol):
-    def __init__(self, **kw):
-        self.dbEncoding = kw.pop('dbEncoding', None)
-        super(SOUnicodeCol, self).__init__(**kw)
-
     def _mssqlType(self):
         if self.customSQLType is not None:
             return self.customSQLType
         return 'N' + super(SOUnicodeCol, self)._mssqlType()
 
     def createValidators(self):
-        return [UnicodeStringValidator(name=self.name, soCol=self)] + \
+        return [UnicodeStringValidator(name=self.name)] + \
             super(SOUnicodeCol, self).createValidators()
 
-    def getDbEncoding(self, state):
-        if self.dbEncoding:
-            return self.dbEncoding
-        dbEncoding = state.soObject.sqlmeta.dbEncoding
-        if dbEncoding:
-            return dbEncoding
-        try:
-            connection = state.connection or state.soObject._connection
-        except AttributeError:
-            dbEncoding = None
-        else:
-            dbEncoding = getattr(connection, "dbEncoding", None)
-        if not dbEncoding:
-            dbEncoding = "utf-8"
-        return dbEncoding
-
 class UnicodeCol(Col):
     baseClass = SOUnicodeCol
 
 
-class IntValidator(validators.Validator):
+class IntValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -700,7 +701,7 @@
     baseClass = SOBigIntCol
 
 
-class BoolValidator(validators.Validator):
+class BoolValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -747,7 +748,7 @@
     baseClass = SOBoolCol
 
 
-class FloatValidator(validators.Validator):
+class FloatValidator(SOValidator):
 
     def to_python(self, value, state):
         if value is None:
@@ -959,7 +960,7 @@
         super(ForeignKey, self).__init__(foreignKey=foreignKey, **kw)
 
 
-class EnumValidator(validators.Validator):
+class EnumValidator(SOValidator):
 
     def to_python(self, value, state):
         if value in self.enumValues:
@@ -1032,7 +1033,7 @@
     baseClass = SOEnumCol
 
 
-class SetValidator(validators.Validator):
+class SetValidator(SOValidator):
     """
     Translates Python tuples into SQL comma-delimited SET strings.
     """
@@ -1330,7 +1331,7 @@
     baseClass = SOTimestampCol
 
 
-class TimedeltaValidator(validators.Validator):
+class TimedeltaValidator(SOValidator):
     def to_python(self, value, state):
         return value
 
@@ -1350,7 +1351,7 @@
 
 from decimal import Decimal
 
-class DecimalValidator(validators.Validator):
+class DecimalValidator(SOValidator):
     def to_python(self, value, state):
         if value is None:
             return None
@@ -1475,7 +1476,7 @@
     baseClass = SODecimalStringCol
 
 
-class BinaryValidator(validators.Validator):
+class BinaryValidator(SOValidator):
     """
     Validator for binary types.
 
@@ -1566,12 +1567,7 @@
         if value is None:
             return None
         if isinstance(value, unicode):
-            try:
-                connection = state.connection or state.soObject._connection
-            except AttributeError:
-                dbEncoding = "ascii"
-            else:
-                dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
+            dbEncoding = self.getDbEncoding(state, default='ascii')
             value = value.encode(dbEncoding)
         if isinstance(value, str):
             return pickle.loads(value)

Author: phd
Date: Tue Aug 20 07:18:31 2013
New Revision: 4649

Log:
Import validators from sqlobject.col, not from formencode

Modified:
   SQLObject/branches/1.5/sqlobject/tests/test_enum.py
   SQLObject/branches/1.5/sqlobject/tests/test_validation.py

Modified: SQLObject/branches/1.5/sqlobject/tests/test_enum.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_enum.py	Mon Aug 19 06:23:20 2013	(r4648)
+++ SQLObject/branches/1.5/sqlobject/tests/test_enum.py	Tue Aug 20 07:18:31 2013	(r4649)
@@ -1,6 +1,6 @@
 from sqlobject import *
+from sqlobject.col import validators
 from sqlobject.tests.dbtest import *
-from formencode import Invalid
 
 ########################################
 ## Enum test
@@ -17,9 +17,10 @@
     raises(
         (Enum1._connection.module.IntegrityError,
          Enum1._connection.module.ProgrammingError,
-         Invalid),
+         validators.Invalid),
         Enum1, l='b')
 
+
 class EnumWithNone(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None])
@@ -30,6 +31,7 @@
         e = EnumWithNone(l=l)
         assert e.l == l
 
+
 class EnumWithDefaultNone(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None], default=None)
@@ -40,6 +42,7 @@
     e = EnumWithDefaultNone()
     assert e.l == None
 
+
 class EnumWithDefaultOther(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None], default='a')

Modified: SQLObject/branches/1.5/sqlobject/tests/test_validation.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_validation.py	Mon Aug 19 06:23:20 2013	(r4648)
+++ SQLObject/branches/1.5/sqlobject/tests/test_validation.py	Tue Aug 20 07:18:31 2013	(r4649)
@@ -1,6 +1,6 @@
 from sqlobject import *
+from sqlobject.col import validators
 from sqlobject.tests.dbtest import *
-from formencode import validators
 
 ########################################
 ## Validation/conversion

Author: phd
Date: Mon Aug 19 06:23:20 2013
New Revision: 4648

Log:
Merged revision 4647 from branch 1.5: self.make_conn_str() returns either a str or a dict

Modified:
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Mon Aug 19 06:21:40 2013	(r4647)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Mon Aug 19 06:23:20 2013	(r4648)
@@ -48,10 +48,10 @@
             # MSDE does not allow SQL server login 
             if kw.get("sspi"):
                 conn_str += "Integrated Security=SSPI;Persist Security Info=False"
-                self.make_conn_str = lambda keys: [conn_str % (keys.host, keys.db)]
+                self.make_conn_str = lambda keys: conn_str % (keys.host, keys.db)
             else:
                 conn_str += "User Id=%s;Password=%s"
-                self.make_conn_str = lambda keys: [conn_str % (keys.host, keys.db, keys.user, keys.password)]
+                self.make_conn_str = lambda keys: conn_str % (keys.host, keys.db, keys.user, keys.password)
 
             kw.pop("sspi", None)
             kw.pop("ncli", None)
@@ -100,7 +100,11 @@
         return c.fetchone()[0]
 
     def makeConnection(self):
-        con = self.dbconnection( *self.make_conn_str(self) )
+        conn_descr = self.make_conn_str(self)
+        if isinstance(conn_descr, dict):
+            con = self.dbconnection(**conn_descr)
+        else:
+            con = self.dbconnection(conn_descr)
         cur = con.cursor()
         cur.execute('SET ANSI_NULLS ON')
         cur.execute("SELECT CAST('12345.21' AS DECIMAL(10, 2))")

Author: phd
Date: Mon Aug 19 06:21:40 2013
New Revision: 4647

Log:
self.make_conn_str() returns either a str or a dict

Modified:
   SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py

Modified: SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py	Fri Aug 16 13:58:36 2013	(r4646)
+++ SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py	Mon Aug 19 06:21:40 2013	(r4647)
@@ -48,10 +48,10 @@
             # MSDE does not allow SQL server login 
             if kw.get("sspi"):
                 conn_str += "Integrated Security=SSPI;Persist Security Info=False"
-                self.make_conn_str = lambda keys: [conn_str % (keys.host, keys.db)]
+                self.make_conn_str = lambda keys: conn_str % (keys.host, keys.db)
             else:
                 conn_str += "User Id=%s;Password=%s"
-                self.make_conn_str = lambda keys: [conn_str % (keys.host, keys.db, keys.user, keys.password)]
+                self.make_conn_str = lambda keys: conn_str % (keys.host, keys.db, keys.user, keys.password)
 
             kw.pop("sspi", None)
             kw.pop("ncli", None)
@@ -100,7 +100,11 @@
         return c.fetchone()[0]
 
     def makeConnection(self):
-        con = self.dbconnection( *self.make_conn_str(self) )
+        conn_descr = self.make_conn_str(self)
+        if isinstance(conn_descr, dict):
+            con = self.dbconnection(**conn_descr)
+        else:
+            con = self.dbconnection(conn_descr)
         cur = con.cursor()
         cur.execute('SET ANSI_NULLS ON')
         cur.execute("SELECT CAST('12345.21' AS DECIMAL(10, 2))")

Author: phd
Date: Fri Aug 16 13:58:36 2013
New Revision: 4646

Log:
Merged revisions 4644, 4645 from branch 1.5: fixed parameters for pymssql

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Fri Aug 16 13:57:20 2013	(r4645)
+++ SQLObject/trunk/docs/News.txt	Fri Aug 16 13:58:36 2013	(r4646)
@@ -30,6 +30,8 @@
 * A bug was fixed in DBConnection.close(); close() doesn't raise
   an UnboundLocalError if connection pool is empty.
 
+* Fixed parameters for pymssql.
+
 SQLObject 1.4.1
 ===============
 

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Fri Aug 16 13:57:20 2013	(r4645)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Fri Aug 16 13:58:36 2013	(r4646)
@@ -61,16 +61,25 @@
             sqlmodule.Binary = lambda st: str(st)
             # don't know whether pymssql uses unicode
             self.usingUnicodeStrings = False
-            self.make_conn_str = lambda keys:  \
-                   ["", keys.user, keys.password, keys.host, keys.db]
+            def _make_conn_str(keys):
+                keys_dict = {}
+                for attr, value in (
+                    ('user', keys.user),
+                    ('password', keys.password),
+                    ('host', keys.host),
+                    ('port', keys.port),
+                    ('database', keys.db),
+                ):
+                    if value: keys_dict[attr] = value
+                return keys_dict
+            self.make_conn_str = _make_conn_str
 
         self.autoCommit=int(autoCommit)
+        self.user = user
+        self.password = password
         self.host = host
         self.port = port
         self.db = db
-        self.user = user
-        self.password = password
-        self.password = password
         self._can_use_max_types = None
         DBAPI.__init__(self, **kw)
 

Author: phd
Date: Fri Aug 16 13:57:20 2013
New Revision: 4645

Log:
Update News

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

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Fri Aug 16 13:54:42 2013	(r4644)
+++ SQLObject/branches/1.5/docs/News.txt	Fri Aug 16 13:57:20 2013	(r4645)
@@ -27,6 +27,8 @@
 * A bug was fixed in DBConnection.close(); close() doesn't raise
   an UnboundLocalError if connection pool is empty.
 
+* Fixed parameters for pymssql.
+
 SQLObject 1.4.1
 ===============
 

Author: phd
Date: Fri Aug 16 13:54:42 2013
New Revision: 4644

Log:
Fixed parameters for pymssql

Modified:
   SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py

Modified: SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py	Fri Aug 16 13:36:32 2013	(r4643)
+++ SQLObject/branches/1.5/sqlobject/mssql/mssqlconnection.py	Fri Aug 16 13:54:42 2013	(r4644)
@@ -61,16 +61,25 @@
             sqlmodule.Binary = lambda st: str(st)
             # don't know whether pymssql uses unicode
             self.usingUnicodeStrings = False
-            self.make_conn_str = lambda keys:  \
-                   ["", keys.user, keys.password, keys.host, keys.db]
+            def _make_conn_str(keys):
+                keys_dict = {}
+                for attr, value in (
+                    ('user', keys.user),
+                    ('password', keys.password),
+                    ('host', keys.host),
+                    ('port', keys.port),
+                    ('database', keys.db),
+                ):
+                    if value: keys_dict[attr] = value
+                return keys_dict
+            self.make_conn_str = _make_conn_str
 
         self.autoCommit=int(autoCommit)
+        self.user = user
+        self.password = password
         self.host = host
         self.port = port
         self.db = db
-        self.user = user
-        self.password = password
-        self.password = password
         self._can_use_max_types = None
         DBAPI.__init__(self, **kw)
 

Author: phd
Date: Fri Aug 16 13:36:32 2013
New Revision: 4643

Log:
Merged revisions 4641, 4642 from branch 1.5: tests enhancements

Modified:
   SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py
   SQLObject/trunk/sqlobject/inheritance/tests/test_indexes.py
   SQLObject/trunk/sqlobject/tests/test_exceptions.py
   SQLObject/trunk/sqlobject/tests/test_groupBy.py
   SQLObject/trunk/sqlobject/tests/test_indexes.py
   SQLObject/trunk/sqlobject/tests/test_schema.py
   SQLObject/trunk/sqlobject/tests/test_select.py
   SQLObject/trunk/sqlobject/tests/test_unicode.py

Modified: SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py
==============================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -8,12 +8,12 @@
 ########################################
 
 class DIPerson(InheritableSQLObject):
-    firstName = StringCol()
+    firstName = StringCol(length=100)
     lastName = StringCol(alternateID=True, length=255)
     manager = ForeignKey("DIManager", default=None)
 
 class DIEmployee(DIPerson):
-    position = StringCol(unique=True)
+    position = StringCol(unique=True, length=100)
 
 class DIManager(DIEmployee):
     subdudes = MultipleJoin("DIPerson", joinColumn="manager_id")

Modified: SQLObject/trunk/sqlobject/inheritance/tests/test_indexes.py
==============================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_indexes.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_indexes.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -4,8 +4,8 @@
 
 
 class InheritedPersonIndexGet(InheritableSQLObject):
-    first_name  = StringCol(notNone=True)
-    last_name   = StringCol(notNone=True)
+    first_name  = StringCol(notNone=True, length=100)
+    last_name   = StringCol(notNone=True, length=100)
     age         = IntCol()
     pk          = DatabaseIndex(first_name, last_name, unique=True)
 

Modified: SQLObject/trunk/sqlobject/tests/test_exceptions.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_exceptions.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/tests/test_exceptions.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -7,7 +7,7 @@
 ########################################
 
 class TestException(SQLObject):
-    name = StringCol(unique=True)
+    name = StringCol(unique=True, length=100)
 
 def test_exceptions():
     if not supports("exceptions"):

Modified: SQLObject/trunk/sqlobject/tests/test_groupBy.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_groupBy.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/tests/test_groupBy.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -22,7 +22,7 @@
         orderBy=GroupbyTest.q.name)
     sql = connection.sqlrepr(select)
     rows = connection.queryAll(sql)
-    assert rows == [('a', 2), ('b', 1)]
+    assert list(rows) == [('a', 2), ('b', 1)]
 
 def test_groupBy_list():
     setupClass(GroupbyTest)
@@ -36,4 +36,4 @@
         orderBy=[GroupbyTest.q.name, GroupbyTest.q.value])
     sql = connection.sqlrepr(select)
     rows = connection.queryAll(sql)
-    assert rows == [('a', 1), ('a', 2), ('b', 1)]
+    assert list(rows) == [('a', 1), ('a', 2), ('b', 1)]

Modified: SQLObject/trunk/sqlobject/tests/test_indexes.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_indexes.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/tests/test_indexes.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -15,7 +15,7 @@
     nameIndex3 = DatabaseIndex({'column': name,
                                 'length': 3})
 class SOIndex2(SQLObject):
-    name = StringCol()
+    name = StringCol(length=100)
     nameIndex = DatabaseIndex({'expression': 'lower(name)'})
 
 def test_indexes_1():
@@ -44,8 +44,8 @@
 
 
 class PersonIndexGet(SQLObject):
-    firstName = StringCol()
-    lastName = StringCol()
+    firstName = StringCol(length=100)
+    lastName = StringCol(length=100)
     age = IntCol(alternateID=True)
     nameIndex = DatabaseIndex(firstName, lastName, unique=True)
 
@@ -90,13 +90,13 @@
 
 
 class PersonIndexGet2(SQLObject):
-    name        = StringCol(alternateID=True)
+    name        = StringCol(alternateID=True, length=100)
     age         = IntCol()
     addresses   = MultipleJoin('AddressIndexGet2')
 
 class AddressIndexGet2(SQLObject):
     person  = ForeignKey('PersonIndexGet2', notNone=True)
-    type    = StringCol(notNone=True)
+    type    = StringCol(notNone=True, length=100)
     street  = StringCol(notNone=True)
     pk      = DatabaseIndex(person, type, unique=True)
 

Modified: SQLObject/trunk/sqlobject/tests/test_schema.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_schema.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/tests/test_schema.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -5,7 +5,7 @@
 ## Schema per connection
 ########################################
 
-class Test(SQLObject):
+class TestSchema(SQLObject):
     foo = UnicodeCol(length=200)
 
 def test_connection_schema():
@@ -16,8 +16,9 @@
     conn.query('CREATE SCHEMA test')
     conn.schema = 'test'
     conn.query('SET search_path TO test')
-    setupClass(Test)
-    Test(foo='bar')
-    assert conn.queryAll("SELECT * FROM test.test")
+    setupClass(TestSchema)
+    assert TestSchema._connection is conn
+    TestSchema(foo='bar')
+    assert conn.queryAll("SELECT * FROM test.test_schema")
     conn.schema = None
     conn.query('SET search_path TO public')

Modified: SQLObject/trunk/sqlobject/tests/test_select.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_select.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/tests/test_select.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -5,7 +5,7 @@
 from dbtest import setSQLiteConnectionFactory
 
 class IterTest(SQLObject):
-    name = StringCol(dbName='name_col')
+    name = StringCol(dbName='name_col', length=200)
 
 names = ('a', 'b', 'c')
 def setupIter():
@@ -113,7 +113,7 @@
     assert False, "IterTest(nonexistant='b') should raise TypeError"
 
 class UniqTest(SQLObject):
-    name = StringCol(dbName='name_col', unique=True)
+    name = StringCol(dbName='name_col', unique=True, length=100)
 
 def test_by_uniq():
     setupClass(UniqTest)

Modified: SQLObject/trunk/sqlobject/tests/test_unicode.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_unicode.py	Fri Aug 16 13:34:59 2013	(r4642)
+++ SQLObject/trunk/sqlobject/tests/test_unicode.py	Fri Aug 16 13:36:32 2013	(r4643)
@@ -85,10 +85,6 @@
 
 def test_dbEncoding():
     setup()
-    assert TestUnicode.sqlmeta.dbEncoding is None
-    assert not hasattr(TestUnicode._connection, 'dbEncoding') or \
-        TestUnicode._connection.dbEncoding is None
-
     TestUnicode.sqlmeta.dbEncoding = 'utf-8'
     _test_select()
     TestUnicode.sqlmeta.dbEncoding = 'latin-1'
@@ -104,3 +100,4 @@
     TestUnicode._connection.dbEncoding = 'ascii'
     raises(UnicodeEncodeError, _test_select)
     del TestUnicode.sqlmeta.dbEncoding
+    TestUnicode._connection.dbEncoding = 'utf-8'

Author: phd
Date: Fri Aug 16 13:34:59 2013
New Revision: 4642

Log:
Patches from Neil Muller to run tests with MySQL

Modified:
   SQLObject/branches/1.5/sqlobject/inheritance/tests/test_deep_inheritance.py
   SQLObject/branches/1.5/sqlobject/inheritance/tests/test_indexes.py
   SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py
   SQLObject/branches/1.5/sqlobject/tests/test_groupBy.py
   SQLObject/branches/1.5/sqlobject/tests/test_indexes.py
   SQLObject/branches/1.5/sqlobject/tests/test_select.py

Modified: SQLObject/branches/1.5/sqlobject/inheritance/tests/test_deep_inheritance.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/inheritance/tests/test_deep_inheritance.py	Fri Aug 16 13:33:02 2013	(r4641)
+++ SQLObject/branches/1.5/sqlobject/inheritance/tests/test_deep_inheritance.py	Fri Aug 16 13:34:59 2013	(r4642)
@@ -8,12 +8,12 @@
 ########################################
 
 class DIPerson(InheritableSQLObject):
-    firstName = StringCol()
+    firstName = StringCol(length=100)
     lastName = StringCol(alternateID=True, length=255)
     manager = ForeignKey("DIManager", default=None)
 
 class DIEmployee(DIPerson):
-    position = StringCol(unique=True)
+    position = StringCol(unique=True, length=100)
 
 class DIManager(DIEmployee):
     subdudes = MultipleJoin("DIPerson", joinColumn="manager_id")

Modified: SQLObject/branches/1.5/sqlobject/inheritance/tests/test_indexes.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/inheritance/tests/test_indexes.py	Fri Aug 16 13:33:02 2013	(r4641)
+++ SQLObject/branches/1.5/sqlobject/inheritance/tests/test_indexes.py	Fri Aug 16 13:34:59 2013	(r4642)
@@ -4,8 +4,8 @@
 
 
 class InheritedPersonIndexGet(InheritableSQLObject):
-    first_name  = StringCol(notNone=True)
-    last_name   = StringCol(notNone=True)
+    first_name  = StringCol(notNone=True, length=100)
+    last_name   = StringCol(notNone=True, length=100)
     age         = IntCol()
     pk          = DatabaseIndex(first_name, last_name, unique=True)
 

Modified: SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py	Fri Aug 16 13:33:02 2013	(r4641)
+++ SQLObject/branches/1.5/sqlobject/tests/test_exceptions.py	Fri Aug 16 13:34:59 2013	(r4642)
@@ -7,7 +7,7 @@
 ########################################
 
 class TestException(SQLObject):
-    name = StringCol(unique=True)
+    name = StringCol(unique=True, length=100)
 
 def test_exceptions():
     if not supports("exceptions"):

Modified: SQLObject/branches/1.5/sqlobject/tests/test_groupBy.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_groupBy.py	Fri Aug 16 13:33:02 2013	(r4641)
+++ SQLObject/branches/1.5/sqlobject/tests/test_groupBy.py	Fri Aug 16 13:34:59 2013	(r4642)
@@ -22,7 +22,7 @@
         orderBy=GroupbyTest.q.name)
     sql = connection.sqlrepr(select)
     rows = connection.queryAll(sql)
-    assert rows == [('a', 2), ('b', 1)]
+    assert list(rows) == [('a', 2), ('b', 1)]
 
 def test_groupBy_list():
     setupClass(GroupbyTest)
@@ -36,4 +36,4 @@
         orderBy=[GroupbyTest.q.name, GroupbyTest.q.value])
     sql = connection.sqlrepr(select)
     rows = connection.queryAll(sql)
-    assert rows == [('a', 1), ('a', 2), ('b', 1)]
+    assert list(rows) == [('a', 1), ('a', 2), ('b', 1)]

Modified: SQLObject/branches/1.5/sqlobject/tests/test_indexes.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_indexes.py	Fri Aug 16 13:33:02 2013	(r4641)
+++ SQLObject/branches/1.5/sqlobject/tests/test_indexes.py	Fri Aug 16 13:34:59 2013	(r4642)
@@ -15,7 +15,7 @@
     nameIndex3 = DatabaseIndex({'column': name,
                                 'length': 3})
 class SOIndex2(SQLObject):
-    name = StringCol()
+    name = StringCol(length=100)
     nameIndex = DatabaseIndex({'expression': 'lower(name)'})
 
 def test_indexes_1():
@@ -44,8 +44,8 @@
 
 
 class PersonIndexGet(SQLObject):
-    firstName = StringCol()
-    lastName = StringCol()
+    firstName = StringCol(length=100)
+    lastName = StringCol(length=100)
     age = IntCol(alternateID=True)
     nameIndex = DatabaseIndex(firstName, lastName, unique=True)
 
@@ -90,13 +90,13 @@
 
 
 class PersonIndexGet2(SQLObject):
-    name        = StringCol(alternateID=True)
+    name        = StringCol(alternateID=True, length=100)
     age         = IntCol()
     addresses   = MultipleJoin('AddressIndexGet2')
 
 class AddressIndexGet2(SQLObject):
     person  = ForeignKey('PersonIndexGet2', notNone=True)
-    type    = StringCol(notNone=True)
+    type    = StringCol(notNone=True, length=100)
     street  = StringCol(notNone=True)
     pk      = DatabaseIndex(person, type, unique=True)
 

Modified: SQLObject/branches/1.5/sqlobject/tests/test_select.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_select.py	Fri Aug 16 13:33:02 2013	(r4641)
+++ SQLObject/branches/1.5/sqlobject/tests/test_select.py	Fri Aug 16 13:34:59 2013	(r4642)
@@ -5,7 +5,7 @@
 from dbtest import setSQLiteConnectionFactory
 
 class IterTest(SQLObject):
-    name = StringCol(dbName='name_col')
+    name = StringCol(dbName='name_col', length=200)
 
 names = ('a', 'b', 'c')
 def setupIter():
@@ -113,7 +113,7 @@
     assert False, "IterTest(nonexistant='b') should raise TypeError"
 
 class UniqTest(SQLObject):
-    name = StringCol(dbName='name_col', unique=True)
+    name = StringCol(dbName='name_col', unique=True, length=100)
 
 def test_by_uniq():
     setupClass(UniqTest)

Author: phd
Date: Fri Aug 16 13:33:02 2013
New Revision: 4641

Log:
Minor changes for the case when all tests are running at once (not one by one)

Modified:
   SQLObject/branches/1.5/sqlobject/tests/test_schema.py
   SQLObject/branches/1.5/sqlobject/tests/test_unicode.py

Modified: SQLObject/branches/1.5/sqlobject/tests/test_schema.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_schema.py	Wed Aug 14 11:16:03 2013	(r4640)
+++ SQLObject/branches/1.5/sqlobject/tests/test_schema.py	Fri Aug 16 13:33:02 2013	(r4641)
@@ -5,7 +5,7 @@
 ## Schema per connection
 ########################################
 
-class Test(SQLObject):
+class TestSchema(SQLObject):
     foo = UnicodeCol(length=200)
 
 def test_connection_schema():
@@ -16,8 +16,9 @@
     conn.query('CREATE SCHEMA test')
     conn.schema = 'test'
     conn.query('SET search_path TO test')
-    setupClass(Test)
-    Test(foo='bar')
-    assert conn.queryAll("SELECT * FROM test.test")
+    setupClass(TestSchema)
+    assert TestSchema._connection is conn
+    TestSchema(foo='bar')
+    assert conn.queryAll("SELECT * FROM test.test_schema")
     conn.schema = None
     conn.query('SET search_path TO public')

Modified: SQLObject/branches/1.5/sqlobject/tests/test_unicode.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_unicode.py	Wed Aug 14 11:16:03 2013	(r4640)
+++ SQLObject/branches/1.5/sqlobject/tests/test_unicode.py	Fri Aug 16 13:33:02 2013	(r4641)
@@ -85,10 +85,6 @@
 
 def test_dbEncoding():
     setup()
-    assert TestUnicode.sqlmeta.dbEncoding is None
-    assert not hasattr(TestUnicode._connection, 'dbEncoding') or \
-        TestUnicode._connection.dbEncoding is None
-
     TestUnicode.sqlmeta.dbEncoding = 'utf-8'
     _test_select()
     TestUnicode.sqlmeta.dbEncoding = 'latin-1'
@@ -104,3 +100,4 @@
     TestUnicode._connection.dbEncoding = 'ascii'
     raises(UnicodeEncodeError, _test_select)
     del TestUnicode.sqlmeta.dbEncoding
+    TestUnicode._connection.dbEncoding = 'utf-8'

Author: phd
Date: Wed Aug 14 11:16:03 2013
New Revision: 4640

Log:
Merged revisions 4637-4639 from branch 1.5: logging is always available;

on w32 there is no need to replace semicolon but it's recommended
to straighten backslashes; removed unused workaround for old Python.

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

Modified: SQLObject/trunk/sqlobject/tests/dbtest.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/dbtest.py	Wed Aug 14 11:14:24 2013	(r4639)
+++ SQLObject/trunk/sqlobject/tests/dbtest.py	Wed Aug 14 11:16:03 2013	(r4640)
@@ -2,23 +2,17 @@
 The framework for making database tests.
 """
 
-import sys
+import logging
 import os
 import re
+import sys
 from py.test import raises
-import py
 import sqlobject
 import sqlobject.conftest as conftest
 
-try:
-    import logging
-    loggingModuleAvailable = True
-except ImportError:
-    loggingModuleAvailable = False
-
 if sys.platform[:3] == "win":
     def getcwd():
-        return os.getcwd().replace(':', '|')
+        return os.getcwd().replace('\\', '/')
 else:
     getcwd = os.getcwd
 
@@ -222,13 +216,6 @@
         for name, value in kw.items():
             setattr(self, name, value)
 
-def d(**kw):
-    """
-    Because ``dict(**kw)`` doesn't work in Python 2.2, this is a
-    replacement.
-    """
-    return kw
-
 def inserts(cls, data, schema=None):
     """
     Creates a bunch of rows.
@@ -314,8 +301,6 @@
     sqlobject.main.exception_level = 0
 
 def setupLogging():
-    if not loggingModuleAvailable:
-        return
     fmt = '[%(asctime)s] %(name)s %(levelname)s: %(message)s'
     formatter = logging.Formatter(fmt)
     hdlr = logging.StreamHandler(sys.stderr)
@@ -325,5 +310,5 @@
     logger.addHandler(hdlr)
 
 __all__ = ['getConnection', 'getConnectionURI', 'setupClass', 'Dummy', 'raises',
-           'd', 'inserts', 'supports', 'deprecated_module',
+           'inserts', 'supports', 'deprecated_module',
            'setup_module', 'teardown_module', 'setupLogging']