jenkins-bot has submitted this change and it was merged.

Change subject: Remove CRLF line endings ......................................................................

Remove CRLF line endings

Change-Id: I570d53e73e5c5ff1c1f15bc049b7e4714ff4ea76 --- M pywikibot/compat/query.py M scripts/tests/data/csv_ingestion.csv 2 files changed, 31 insertions(+), 31 deletions(-)

Approvals: XZise: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/compat/query.py b/pywikibot/compat/query.py index 42ff2c7..c203e54 100644 --- a/pywikibot/compat/query.py +++ b/pywikibot/compat/query.py @@ -1,29 +1,29 @@ -import pywikibot -from pywikibot.data import api -from pywikibot.tools import deprecated, deprecate_arg - -import sys -if sys.version_info[0] > 2: - import io as StringIO -else: - import StringIO - - -@deprecated("pywikibot.data.api.Request") -@deprecate_arg("useAPI", None) -@deprecate_arg("retryCount", None) -@deprecate_arg("encodeTitle", None) -def GetData(request, site=None, back_response=False): - if site: - request['site'] = site - - req = api.Request(**request) - result = req.submit() - - if back_response: - pywikibot.warning(u"back_response is no longer supported; an empty " - u"response object will be returned") - res_dummy = StringIO.StringIO() - res_dummy.__dict__.update({u'code': 0, u'msg': u''}) - return res_dummy, result - return result +import pywikibot +from pywikibot.data import api +from pywikibot.tools import deprecated, deprecate_arg + +import sys +if sys.version_info[0] > 2: + import io as StringIO +else: + import StringIO + + +@deprecated("pywikibot.data.api.Request") +@deprecate_arg("useAPI", None) +@deprecate_arg("retryCount", None) +@deprecate_arg("encodeTitle", None) +def GetData(request, site=None, back_response=False): + if site: + request['site'] = site + + req = api.Request(**request) + result = req.submit() + + if back_response: + pywikibot.warning(u"back_response is no longer supported; an empty " + u"response object will be returned") + res_dummy = StringIO.StringIO() + res_dummy.__dict__.update({u'code': 0, u'msg': u''}) + return res_dummy, result + return result diff --git a/scripts/tests/data/csv_ingestion.csv b/scripts/tests/data/csv_ingestion.csv index a8f973c..1be0a6a 100755 --- a/scripts/tests/data/csv_ingestion.csv +++ b/scripts/tests/data/csv_ingestion.csv @@ -1,2 +1,2 @@ -description.en,source,author,license,set,name,url -"""Sounds"" icon",http://commons.wikimedia.org/wiki/File:Sound-icon.svg,KDE artists | Silstor,LGPL,Crystal SVG icon set,Sound icon,http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png +description.en,source,author,license,set,name,url +"""Sounds"" icon",http://commons.wikimedia.org/wiki/File:Sound-icon.svg,KDE artists | Silstor,LGPL,Crystal SVG icon set,Sound icon,http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png