gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-29 22:28:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/docutils: Clean old versions up

Browse Source
This commit is contained in:
Michał Górny
2017-05-03 13:01:27 +02:00
parent 59b46ab850
commit fdd20aa17d
3 changed files with 0 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
dev-python/docutils/files/docutils-0.12-fix-tests-pygments.patch
View File

@@ -1,105 +0,0 @@
From c8329f1bca61c203b48f80f01876384a79cceab5 Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sat, 14 May 2016 21:15:00 +0000
Subject: [PATCH] Apply #131 (update pygments test to pygments 2.1) by
cstratak.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7936 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
.../test_parsers/test_rst/test_directives/test_code.py | 6 +++---
.../test_rst/test_directives/test_code_long.py | 2 +-
docutils/test/test_parsers/test_rst/test_interpreted.py | 14 +++++++-------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/test_parsers/test_rst/test_directives/test_code.py b/test/test_parsers/test_rst/test_directives/test_code.py
index 5e013d4..8affcbe 100644
--- a/test/test_parsers/test_rst/test_directives/test_code.py
+++ b/test/test_parsers/test_rst/test_directives/test_code.py
@@ -107,10 +107,10 @@ totest['code-parsing'] = [
<inline classes="keyword">
print
\n\
- <inline classes="literal string">
+ <inline classes="literal string single">
'hello world'
\n\
- <inline classes="comment">
+ <inline classes="comment single">
# to stdout
"""],
["""\
@@ -155,7 +155,7 @@ totest['code-parsing'] = [
<inline classes="ln">
11 \n\
\n\
- <inline classes="comment">
+ <inline classes="comment single">
# and now for something completely different
\n\
<inline classes="ln">
diff --git a/test/test_parsers/test_rst/test_directives/test_code_long.py b/test/test_parsers/test_rst/test_directives/test_code_long.py
index f015357..e6430cc 100644
--- a/test/test_parsers/test_rst/test_directives/test_code_long.py
+++ b/test/test_parsers/test_rst/test_directives/test_code_long.py
@@ -60,7 +60,7 @@ totest['code-parsing-long'] = [
<inline classes="ln">
11 \n\
\n\
- <inline classes="comment">
+ <inline classes="comment single">
# and now for something completely different
\n\
<inline classes="ln">
diff --git a/test/test_parsers/test_rst/test_interpreted.py b/test/test_parsers/test_rst/test_interpreted.py
index f9a1194..87d0a77 100755
--- a/test/test_parsers/test_rst/test_interpreted.py
+++ b/test/test_parsers/test_rst/test_interpreted.py
@@ -119,30 +119,30 @@ totest['basics'] = [
:not a role if it contains whitespace:
"""],
["""\
-:title:`` (empty interpteted text not recognized)
+:title:`` (empty interpreted text not recognized)
""",
"""\
<document source="test data">
<paragraph>
- :title:`` (empty interpteted text not recognized)
+ :title:`` (empty interpreted text not recognized)
"""],
["""\
-:title:`\ ` (interpteted text containing empty string)
+:title:`\ ` (interpreted text containing empty string)
""",
"""\
<document source="test data">
<paragraph>
<title_reference>
- (interpteted text containing empty string)
+ (interpreted text containing empty string)
"""],
["""\
-`\ `:title: (interpteted text containing empty string (postfix))
+`\ `:title: (interpreted text containing empty string (postfix))
""",
"""\
<document source="test data">
<paragraph>
<title_reference>
- (interpteted text containing empty string (postfix))
+ (interpreted text containing empty string (postfix))
"""],
["""\
:title:`\ non-empty`
@@ -283,7 +283,7 @@ Python code :python:`print("The end")`.
print
<inline classes="punctuation">
(
- <inline classes="literal string">
+ <inline classes="literal string double">
"The end"
<inline classes="punctuation">
)
--
2.7.4.GIT

51
dev-python/docutils/files/docutils-0.12-fix-tests-pypy.patch
View File

@@ -1,51 +0,0 @@
diff --git a/test/test_parsers/test_rst/test_directives/test_images.py b/test/test_parsers/test_rst/test_directives/test_images.py
index ea3adfa..9743fba 100755
--- a/test/test_parsers/test_rst/test_directives/test_images.py
+++ b/test/test_parsers/test_rst/test_directives/test_images.py
@@ -277,7 +277,7 @@ totest['images'] = [
<literal_block xml:space="preserve">
.. image:: picture.png
:scale: fifty
-""" % DocutilsTestSupport.exception_data(int, "fifty")[1][0]],
+""" % DocutilsTestSupport.exception_data(int, u"fifty")[1][0]],
["""\
.. image:: picture.png
:scale: 50
diff --git a/test/test_parsers/test_rst/test_directives/test_tables.py b/test/test_parsers/test_rst/test_directives/test_tables.py
index 1200ab0..b75844a 100755
--- a/test/test_parsers/test_rst/test_directives/test_tables.py
+++ b/test/test_parsers/test_rst/test_directives/test_tables.py
@@ -12,6 +12,7 @@ from __init__ import DocutilsTestSupport
import os, sys
import csv
+import platform
from docutils.parsers.rst.directives import tables
@@ -34,9 +35,14 @@ else:
# some error messages changed in Python 3.3:
csv_eod_error_str = 'unexpected end of data'
-if sys.version_info < (3,2,4) and not (# backport to 2.7.4
- sys.version_info[:2] == (2,7) and sys.version_info[2] > 3):
+if sys.version_info < (3,2,4) and (
+ # CPython has backported to 2.7.4, PyPy has not
+ platform.python_implementation() == 'PyPy' or not (
+ sys.version_info[:2] == (2,7) and sys.version_info[2] > 3)):
csv_eod_error_str = 'newline inside string'
+# pypy adds a line number
+if platform.python_implementation() == 'PyPy':
+ csv_eod_error_str = 'line 1: ' + csv_eod_error_str
csv_unknown_url = "'bogus.csv'"
if sys.version_info < (3,3,2):
csv_unknown_url = "bogus.csv"
@@ -782,7 +788,7 @@ u"""\
:widths: 0 0 0
\n\
some, csv, data
-""" % DocutilsTestSupport.exception_data(int, "y")[1][0]],
+""" % DocutilsTestSupport.exception_data(int, u"y")[1][0]],
["""\
.. csv-table:: good delimiter
:delim: /