Changes for Python 2.6, setuptools 0.6c9

[Bob Ricks]

--- MySQL-python-1.2.2/ez_setup.py 2007-02-24 16:09:07.000000000 -0500
+++ ../MySQL-python-1.2.2/ez_setup.py 2008-12-17 08:45:30.000000000 -0500
@@ -14,7 +14,7 @@
This file can also be run as a script to install or upgrade setuptools.
"""
import sys
-DEFAULT_VERSION = "0.6c5"
+DEFAULT_VERSION = "0.6c9"
DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]

md5_data = {
@@ -39,6 +39,7 @@
'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+ 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
}

import sys, os
--- MySQL-python-1.2.2/MySQLdb/converters.py 2007-01-29 13:02:17.000000000 -0500
+++ ../MySQL-python-1.2.2/MySQLdb/converters.py 2009-01-14 07:50:42.000000000 -0500
@@ -34,7 +34,7 @@

from _mysql import string_literal, escape_sequence, escape_dict, escape, NULL
from constants import FIELD_TYPE, FLAG
-from sets import BaseSet, Set
+#from sets import BaseSet, Set
from times import *
import types
import array
@@ -42,7 +42,7 @@
def Bool2Str(s, d): return str(int(s))

def Str2Set(s):
- return Set([ i for i in s.split(',') if i ])
+ return set([ i for i in s.split(',') if i ])

def Set2Str(s, d):
return string_literal(','.join(s), d)
@@ -126,7 +126,7 @@
types.BooleanType: Bool2Str,
DateTimeType: DateTime2literal,
DateTimeDeltaType: DateTimeDelta2literal,
- Set: Set2Str,
+ set: Set2Str,
FIELD_TYPE.TINY: int,
FIELD_TYPE.SHORT: int,
FIELD_TYPE.LONG: long,
--- MySQL-python-1.2.2/MySQLdb/init.py 2007-02-26 14:00:32.000000000 -0500
+++ ../MySQL-python-1.2.2/MySQLdb/init.py 2009-01-14 07:43:02.000000000 -0500
@@ -31,8 +31,8 @@
from MySQLdb.times import Date, Time, Timestamp, \ DateFromTicks, TimeFromTicks, TimestampFromTicks

-from sets import ImmutableSet
-class DBAPISet(ImmutableSet):
+#from sets import ImmutableSet
+class DBAPISet(frozenset):

 """A special type of set for which A == x is true if A is a
 DBAPISet and x is a member of that set."""

[Andy Dustman]

Don't post patches in the forums... put them in the patch tracker... Also a lot of this is already fixed in svn 1.2 branch.