From a63002ecb5ff7a9dfa7b77e04aafd853b79811a2 Mon Sep 17 00:00:00 2001
From: adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>
Date: Sun, 19 Sep 2004 21:38:08 +0000
Subject: [PATCH]  * Removed some old-style Python stuff from setup.py

 * Added a bit of documentation on ssl parameter to Connection

 * Version 1.1.5
---
 MySQLdb/MySQLdb/__init__.py    | 2 +-
 MySQLdb/MySQLdb/connections.py | 6 +++++-
 MySQLdb/_mysql.c               | 4 ++--
 MySQLdb/setup.py               | 8 ++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/MySQLdb/MySQLdb/__init__.py b/MySQLdb/MySQLdb/__init__.py
index 7808b91..9a4cb28 100644
--- a/MySQLdb/MySQLdb/__init__.py
+++ b/MySQLdb/MySQLdb/__init__.py
@@ -18,7 +18,7 @@ __revision__ = """$Revision$"""[11:-2]
 version_info = (
     1,
     1,
-    4,
+    5,
     "final",
     1)
 if version_info[3] == "final": __version__ = "%d.%d.%d" % version_info[:3]
diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/MySQLdb/connections.py
index 03646de..5551561 100644
--- a/MySQLdb/MySQLdb/connections.py
+++ b/MySQLdb/MySQLdb/connections.py
@@ -61,7 +61,11 @@ class Connection(_mysql.connection):
             default encoding is used. If not set at all, character
             columns are returned as normal strings.
     client_flag -- integer, flags to use or 0 (see MySQL docs or constants/CLIENTS.py)
-
+    ssl -- dictionary or mapping, contains SSL connection parameters; see
+           the MySQL documentation for more details (mysql_ssl_set()).
+           If this is set, and the client does not support SSL,
+           UnsupportedError will be raised.
+           
     There are a number of undocumented, non-standard methods. See the
     documentation for the MySQL C API for some hints on what they do.
 
diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c
index ae7c611..5d23a17 100644
--- a/MySQLdb/_mysql.c
+++ b/MySQLdb/_mysql.c
@@ -1,5 +1,5 @@
-#define version_info "(1,1,4,'final',1)"
-#define __version__ "1.1.4"
+#define version_info "(1,1,5,'final',1)"
+#define __version__ "1.1.5"
 /*
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/MySQLdb/setup.py b/MySQLdb/setup.py
index 13050f4..168dbfe 100644
--- a/MySQLdb/setup.py
+++ b/MySQLdb/setup.py
@@ -5,20 +5,20 @@
 import os, sys
 from distutils.core import setup
 from distutils.extension import Extension
-import string
 
 YES = 1
 NO = 0
 
 mysqlclient = os.getenv('mysqlclient', 'mysqlclient')
-mysqlversion = tuple(map(int, string.split(os.getenv('mysqlversion', '4.0.20'), '.')))
-mysqloptlibs = string.split(os.getenv('mysqloptlibs', ''))
+mysqlversion = tuple([ int(n)
+                       for n in os.getenv('mysqlversion','4.0.20').split('.')])
+mysqloptlibs = os.getenv('mysqloptlibs', '').split()
 embedded_server = (mysqlclient == 'mysqld')
 
 name = "MySQL-%s" % os.path.basename(sys.executable)
 if embedded_server:
     name = name + "-embedded"
-version = "1.1.4"
+version = "1.1.5"
 
 # include files and library locations should cover most platforms
 include_dirs = [