From 22eb48dae55bf3a322693c5dfdaae7821216d5e3 Mon Sep 17 00:00:00 2001
From: olveyra <none@none>
Date: Tue, 5 Aug 2008 16:51:12 +0000
Subject: [PATCH] added MYSQL_CONNECTION_SETTINGS settings

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40146
---
 scrapy/trunk/scrapy/templates/settings.tmpl | 1 +
 scrapy/trunk/scrapy/utils/db.py             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scrapy/trunk/scrapy/templates/settings.tmpl b/scrapy/trunk/scrapy/templates/settings.tmpl
index 9b13b198e..9dfcf3226 100644
--- a/scrapy/trunk/scrapy/templates/settings.tmpl
+++ b/scrapy/trunk/scrapy/templates/settings.tmpl
@@ -16,6 +16,7 @@ ENABLED_SPIDERS_FILE = '%s/conf/enabled_spiders.list' % __project_name__.__path_
 DEFAULT_ITEM_CLASS = 'scrapy.item.ScrapedItem'
 USER_AGENT = '%s/%s' % (BOT_NAME, BOT_VERSION)
 DOWNLOAD_TIMEOUT = 600
+MYSQL_CONNECTION_SETTINGS = {"charset": "utf8" }
 
 SCHEDULER = 'scrapy.core.scheduler.Scheduler'
 SCHEDULER_ORDER = 'BFO'   # available orders: BFO (default), DFO
diff --git a/scrapy/trunk/scrapy/utils/db.py b/scrapy/trunk/scrapy/utils/db.py
index bc26518cf..6e278f133 100644
--- a/scrapy/trunk/scrapy/utils/db.py
+++ b/scrapy/trunk/scrapy/utils/db.py
@@ -2,6 +2,7 @@
 Function for dealing with databases
 """
 import re
+from scrapy.conf import settings
 
 def mysql_connect(db_uri, **kwargs):
     """
@@ -17,7 +18,6 @@ def mysql_connect(db_uri, **kwargs):
         if d['passwd'] is None:
             del(d['passwd'])
 
-        d['charset'] = "utf8"
-        #d['reconnect'] = 1
+        d.update(settings.get("MYSQL_CONNECTION_SETTINGS"))
         d.update(kwargs)
         return MySQLdb.connect(**d)