Initial Import for SVN

Author: nerdynick

.gitignore

@@ -0,0 +1,3 @@
+*.svn*
+.project
+.pydevproject

LICENSE

@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  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 that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU 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 as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

PySQLPool/ChangeLog

@@ -0,0 +1,15 @@
+0.3.6
+	* Started Sphinx/RST style Documentation
+	* Added LICENSE File
+	* Added README File
+	* Updated Email in setup.py
+	* Added favicon to docs
+	* Added ChangeLog
+	* Fixes to Thread Locking Contention
+	* Improved Hash Generation for Pool Key
+	* Cleaned up Import Statements
+	* Starts to future improvements to thread based MySQL transactions
+	* Improved Python2.4 Support
+	* Added returns of affect rows to queryMulti and queryMany
+	* Added alias's for executeMulti, executeMany, execute, executeOne matching queryMulti, queryMany, query, queryOne respectfully
+	* Added support for use of with. ie Content Management. Submitted by Denis Malinovsky

PySQLPool/MANIFEST

@@ -0,0 +1,5 @@
+setup.py
+PySQLPool/PySQLConnection.py
+PySQLPool/PySQLPool.py
+PySQLPool/PySQLQuery.py
+PySQLPool/__init__.py

PySQLPool/PySQLPool/PySQLConnection.py

@@ -0,0 +1,185 @@
+"""
+@author: Nick Verbeck
+@since: 5/12/2008
+"""
+import MySQLdb
+import datetime
+from threading import Semaphore
+
+try:
+	from hashlib import md5 
+except Exception, e:
+	from md5 import md5
+
+class PySQLConnection(object):
+	"""
+	Command Pattern Object to store connection information for use in PySQLPool
+	
+	@author: Nick Verbeck
+	@since: 5/12/2008
+	@version: 0.1
+	"""
+	
+	def __init__(self, *args, **kargs):
+		"""
+		Constructor for the PySQLConnection class
+		@param commitOnEnd: Default False, When query is complete do you wish to auto commit. This is a always on for this connection
+		@author: Nick Verbeck
+		@since: 5/12/2008
+		@updated: 7/19/2008 - Added commitOnEnd
+		@updated: 10/26/2008 - Switched to use *args and **kargs
+		"""
+		self.info = {
+					 'host': 'localhost',
+					 'user': 'root',
+					 'passwd': '',
+					 'db': '',
+					 'port': 3306
+					 }
+		if kargs.has_key('host'):
+			self.info['host'] = kargs['host']
+		if kargs.has_key('user'):
+			self.info['user'] = kargs['user']
+		if kargs.has_key('passwd'):
+			self.info['passwd'] = kargs['passwd']
+		if kargs.has_key('db'):
+			self.info['db'] = kargs['db']
+		if kargs.has_key('port'):
+			self.info['port'] = int(kargs['port'])
+		if kargs.has_key('connect_timeout'):
+			self.info['connect_timeout'] = kargs['connect_timeout']
+		if kargs.has_key('use_unicode'):
+			self.info['use_unicode'] = kargs['use_unicode']
+		if kargs.has_key('charset'):
+			self.info['charset'] = kargs['charset']
+		if kargs.has_key('local_infile'):
+			self.info['local_infile'] = kargs['local_infile']
+			
+		#Support Legacy Username
+		if kargs.has_key('username'):
+			self.info['user'] = kargs['username']
+		#Support Legacy Password
+		if kargs.has_key('password'):
+			self.info['passwd'] = kargs['password']
+		#Support Legacy Schema
+		if kargs.has_key('schema'):
+			self.info['db'] = kargs['schema']
+			
+		if kargs.has_key('commitOnEnd'):
+			self.commitOnEnd = kargs['commitOnEnd']
+		else:
+			self.commitOnEnd = False
+			
+		hashStr = ''.join([str(x) for x in self.info.values()])
+		self.key = md5(hashStr).hexdigest()
+		
+	def __getattr__(self, name):
+		try:
+			return self.info[name]
+		except Exception, e:
+			return None
+  
+
+connection_timeout = datetime.timedelta(seconds=20)
+
+class PySQLConnectionManager(object):
+	"""
+	Physical Connection manager
+	
+	Used to manage the physical MySQL connection and the thread safe locks on that connection
+	
+	@author: Nick Verbeck
+	@since: 5/12/2008
+	@version: 0.1
+	"""
+	def __init__(self, PySQLConnectionObj):
+		"""
+		Constructor for PySQLConnectionManager
+		
+		@param PySQLConnectionObj: PySQLConnection Object representing your connection string
+		@author: Nick Verbeck
+		@since: 5/12/2008
+		"""
+		
+		self.connectionInfo = PySQLConnectionObj
+		self.connection = None
+		self.lock = Semaphore()
+		self.activeConnections = 0
+		self.query = None
+		self.lastConnectionCheck = None
+		self.Connect()
+		
+	def updateCheckTime(self):
+		self.lastConnectionCheck = datetime.datetime.now()
+
+	def Connect(self):
+		"""
+		Creates a new physical connection to the database
+		
+		@author: Nick Verbeck
+		@since: 5/12/2008
+		"""
+		self.connection = MySQLdb.connect(*[], **self.connectionInfo.info)
+		self.updateCheckTime()
+		
+	def ReConnect(self):
+		"""
+		Attempts to close current connection if open and re-opens a new connection to the database
+		
+		@author: Nick Verbeck
+		@since: 5/12/2008
+		"""
+		self.Close()
+		self.Connect()
+		
+	def TestConnection(self, forceCheck = False):
+		"""
+		Tests the current physical connection if it is open and hasn't timed out
+		
+		@return: boolean True is connection is open, False if connection is closed
+		@author: Nick Verbeck
+		@since: 5/12/2008
+		"""
+		if self.connection is None:
+			return False
+		else:
+			if forceCheck is True or (datetime.datetime.now() - self.lastConnectionCheck) >= connection_timeout:
+				try:
+					cursor = self.connection.cursor(MySQLdb.cursors.DictCursor)
+					cursor.execute('select current_user')
+					self.updateCheckTime()
+					return True
+				except Exception, e:
+					self.connection.close()
+					self.connection = None
+					return False
+			else:
+				return True
+			
+	def Commit(self):
+		"""
+		Commit MySQL Transaction to database
+		
+		@author: Nick Verbeck
+		@since: 5/12/2008
+		"""
+		try:
+			self.connection.commit()
+			self.updateCheckTime()
+		except Exception, e:
+			pass
+	
+	def Close(self):
+		"""
+		Commits and closes the current connection
+		
+		@author: Nick Verbeck
+		@since: 5/12/2008
+		"""
+		if self.connection is not None:
+			try:
+				self.connection.commit()
+				self.connection.close()
+				self.connection = None
+			except Exception, e:
+				pass