correcting SlaveDatabaseWrapper cursor to properly handle db encodings.

mmalone · Nov 25, 2009 · 124f5b9 · 124f5b9
1 parent 9cacae8
commit 124f5b9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/db/__init__.py b/db/__init__.py
@@ -40,7 +40,7 @@ def _cursor(self, settings):
                 'charset': 'utf8',
                 'use_unicode': True,
             }
-            kwargs = pick_random_slave(settings.SLAVE_DATABASES)
+            kwargs.update(pick_random_slave(settings.SLAVE_DATABASES))
             self.connection = Database.connect(**kwargs)
             self.connection.encoders[SafeUnicode] = self.connection.encoders[unicode]
             self.connection.encoders[SafeString] = self.connection.encoders[str]