From 9f16f040b661f18f2e61a35427199c099bfd2f90 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 1 Sep 2017 11:53:59 +0200 Subject: [PATCH 1/2] ur'string' not needed in Py 2, syntax error in Py3 Convert `ur'Scrapy Documentation'`--> `u'Scrapy Documentation'`to be compatible with both Python 2 and Python 3. See #2891 --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 640dcd7cb..5780db65d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -191,7 +191,7 @@ htmlhelp_basename = 'Scrapydoc' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). latex_documents = [ - ('index', 'Scrapy.tex', ur'Scrapy Documentation', + ('index', 'Scrapy.tex', u'Scrapy Documentation', ur'Scrapy developers', 'manual'), ] From b7022360824cd1a8aa19fb0d65ea01700f06a208 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 1 Sep 2017 11:56:09 +0200 Subject: [PATCH 2/2] ur'string' not needed in Py 2, syntax error in Py3 Convert `u'(.*)\:\d+\:\s\[(.*)\]\s(?:(.*)\sto\s(.*)|(.*))'`--> `u'(.*)\:\d+\:\s\[(.*)\]\s(?:(.*)\sto\s(.*)|(.*))'`to be compatible with both Python 2 and Python 3. See #2891 --- docs/utils/linkfix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/utils/linkfix.py b/docs/utils/linkfix.py index 40316968f..6290adbe2 100755 --- a/docs/utils/linkfix.py +++ b/docs/utils/linkfix.py @@ -20,7 +20,7 @@ _filename = None _contents = None # A regex that matches standard linkcheck output lines -line_re = re.compile(ur'(.*)\:\d+\:\s\[(.*)\]\s(?:(.*)\sto\s(.*)|(.*))') +line_re = re.compile(u'(.*)\:\d+\:\s\[(.*)\]\s(?:(.*)\sto\s(.*)|(.*))') # Read lines from the linkcheck output file try: