# HG changeset patch
# User Andy Dustman <adustman@users.sourceforge.net>
# Date 1283308093 14400
# Node ID e705129ff06f6ba2d3c17adf090d2a859eaf5370
# Parent  ffe9e5ca17e09409dcc7317aec4dc1495d1756ab# Parent  6ec608cdd19c03a6df6be48cc83ae4429f42edbe
Merge some Kyle stuff

diff -r ffe9e5ca17e0 -r e705129ff06f .cvsignore
--- a/.cvsignore	Tue Feb 23 00:39:20 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-dist
-build
-regress.py
-test.py
-PKG-INFO
-*.pyc
diff -r ffe9e5ca17e0 -r e705129ff06f .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue Aug 31 22:28:13 2010 -0400
@@ -0,0 +1,4 @@
+.*\.pyc$
+.*\.pyo$
+^build/
+^dist/
diff -r ffe9e5ca17e0 -r e705129ff06f HISTORY
--- a/HISTORY	Tue Feb 23 00:39:20 2010 -0500
+++ b/HISTORY	Tue Aug 31 22:28:13 2010 -0400
@@ -1,3 +1,19 @@
+=====================
+ What's new in 1.2.3
+=====================
+
+ez_setup.py has been update to include various fixes that affect the build.
+
+Better Python version and dependency detection as well as eliminate exception
+warnings under Python 2.6.
+
+Eliminated memory leaks related to Unicode and failed connections.
+
+Corrected connection .escape() functionality.
+
+Miscellaneous cleanups and and expanded testing suite to ensure ongoing release
+quality.
+
 =====================
  What's new in 1.2.2
 =====================
diff -r ffe9e5ca17e0 -r e705129ff06f ez_setup.py
--- a/ez_setup.py	Tue Feb 23 00:39:20 2010 -0500
+++ b/ez_setup.py	Tue Aug 31 22:28:13 2010 -0400
@@ -14,7 +14,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c9"
+DEFAULT_VERSION = "0.6c11"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
@@ -28,6 +28,14 @@
     'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
     'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
     'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+    'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
+    'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
+    'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
+    'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
+    'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
+    'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
+    'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
+    'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
     'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
     'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
     'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
diff -r ffe9e5ca17e0 -r e705129ff06f setup_posix.py
--- a/setup_posix.py	Tue Feb 23 00:39:20 2010 -0500
+++ b/setup_posix.py	Tue Aug 31 22:28:13 2010 -0400
@@ -53,6 +53,13 @@
     removable_compile_args = [ compiler_flag(f) for f in "ILl" ]
     extra_compile_args = [ i.replace("%", "%%") for i in mysql_config("cflags")
                            if i[:2] not in removable_compile_args ]
+
+    # Copy the arch flags for linking as well
+    extra_link_args = list()
+    for i in range(len(extra_compile_args)):
+        if extra_compile_args[i] == '-arch':
+            extra_link_args += ['-arch', extra_compile_args[i + 1]]
+
     include_dirs = [ dequote(i[2:])
                      for i in mysql_config('include')
                      if i.startswith(compiler_flag('I')) ]
@@ -81,6 +88,7 @@
         library_dirs = library_dirs,
         libraries = libraries,
         extra_compile_args = extra_compile_args,
+        extra_link_args = extra_link_args,
         include_dirs = include_dirs,
         extra_objects = extra_objects,
         define_macros = define_macros,