Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173332
Change subject: Bug 73151: split use of 'site' and 'dbname'
......................................................................
Bug 73151: split use of 'site' and 'dbname'
Change-Id: I3cf0226fc55405071cc0384db6621bd2926eeb83
---
M pywikibot/pagegenerators.py
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/32/173332/1
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index cc37416..f761ed1 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -1885,13 +1885,19 @@
# We want to let people to set a custom dbname
# since the master dbname might not be exactly
# equal to the name on the replicated site
- site = site.dbName()
- conn = mysqldb.connect(config.db_hostname, db=site,
+ dbname = site.dbName()
+ else:
+ dbname = site
+ site = None
+ conn = mysqldb.connect(config.db_hostname, db=dbname,
user=config.db_username,
passwd=config.db_password)
cursor = conn.cursor()
pywikibot.output(u'Executing query:\n%s' % query)
- query = query.encode(site.encoding())
+ if site:
+ query = query.encode(site.encoding())
+ else:
+ query = query.encode("utf-8")
cursor.execute(query)
while True:
try:
--
To view, visit https://gerrit.wikimedia.org/r/173332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cf0226fc55405071cc0384db6621bd2926eeb83
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
