http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10734
Revision: 10734
Author: xqt
Date: 2012-11-15 08:31:33 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
revert revisions r9973, r9971 - no longer needed
Modified Paths:
--------------
trunk/pywikipedia/config.py
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/config.py
===================================================================
--- trunk/pywikipedia/config.py 2012-11-14 21:19:36 UTC (rev 10733)
+++ trunk/pywikipedia/config.py 2012-11-15 08:31:33 UTC (rev 10734)
@@ -487,18 +487,6 @@
# processing. As higher this value this effect will decrease.
max_queue_size = 64
-# Define the line separator. Pages retrieved via API have "\n" whereas
-# pages fetched from screen (mostly) have "\r\n". Interwiki and category
-# separator settings in family files should use multiplied of this.
-# LS is a shortcut alias.
-line_separator = LS = u'\r\n'
-
-############## TEMPORARY SETTINGS ##############
-# Temporary solution for 2012 version survey, search for this key
-# in wikipedia.py
-import sys # Just for the next line, remove them together
-suppresssurvey = (sys.version >= '2.7.2')
-
# End of configuration section
# ============================
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2012-11-14 21:19:36 UTC (rev 10733)
+++ trunk/pywikipedia/wikipedia.py 2012-11-15 08:31:33 UTC (rev 10734)
@@ -8603,23 +8603,6 @@
MyURLopener.addheaders = [('User-agent', useragent)]
-# This is a temporary part for the 2012 version survey
-#
http://thread.gmane.org/gmane.comp.python.pywikipediabot.general/12473
-# Upon removing the connected lines from config.py should be removed, too.
-if not config.suppresssurvey:
- output(
-"""
-\03{lightyellow}Dear Pywikipedia user!\03{default}
-Pywikibot has detected that you use this outdated version of Python:
-%s.
-We would like to hear your voice before ceasing support of this version.
-Please update to \03{lightyellow}Python 2.7.2\03{default} or higher if possible or visit
-http://www.mediawiki.org/wiki/Pywikipediabot/Survey2012 to tell us why we
-should support your version and to learn how to hide this message.
-After collecting opinions for a time we will decide and announce the deadline
-of deprecating use of old Python versions for Pywikipedia.
-""" % sys.version)
-
# The following will monkey-patch the pywikibot module to contain the same
# functions and variables as wikipedia itself. This means we no longer have
# to import wikipedia as pywikibot - instead, we can just import pywikibot