diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-01-03 23:50:23 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-01-03 23:50:23 +0000 |
| commit | 6b4f79532bcb6989f79f48d677e34318558584c0 (patch) | |
| tree | 031136668549c6ac8e84275ee480e9d5a22c457e /docutils/transforms | |
| parent | f68e02cb5b84a817e0a66942104649c68cbb09f6 (diff) | |
| download | docutils-6b4f79532bcb6989f79f48d677e34318558584c0.tar.gz | |
Drop (most) special-casing for Python 2.x.
Simplifications for nodes.py and error_reporting.py will follow.
git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk/docutils@8928 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils/transforms')
| -rw-r--r-- | docutils/transforms/frontmatter.py | 6 | ||||
| -rw-r--r-- | docutils/transforms/universal.py | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/docutils/transforms/frontmatter.py b/docutils/transforms/frontmatter.py index 2df93a11b..8b523b406 100644 --- a/docutils/transforms/frontmatter.py +++ b/docutils/transforms/frontmatter.py @@ -28,10 +28,6 @@ from docutils import nodes, utils from docutils.transforms import TransformError, Transform -if sys.version_info >= (3, 0): - unicode = str # noqa - - class TitlePromoter(Transform): """ @@ -512,7 +508,7 @@ class DocInfo(Transform): The set of separators is locale dependent (default: ";"- or ","). """ # @@ keep original formatting? (e.g. ``:authors: A. Test, *et-al*``) - text = ''.join(unicode(node) + text = ''.join(str(node) for node in field[1].findall(nodes.Text)) if not text: raise TransformError diff --git a/docutils/transforms/universal.py b/docutils/transforms/universal.py index 1af9222fa..581be1a58 100644 --- a/docutils/transforms/universal.py +++ b/docutils/transforms/universal.py @@ -28,10 +28,6 @@ from docutils.transforms import TransformError, Transform from docutils.utils import smartquotes -if sys.version_info >= (3, 0): - unicode = str # noqa - - class Decorations(Transform): """ @@ -263,11 +259,11 @@ class SmartQuotes(Transform): for node in txtnodes: if (isinstance(node.parent, self.literal_nodes) or isinstance(node.parent.parent, self.literal_nodes)): - yield ('literal', unicode(node)) + yield ('literal', str(node)) else: # SmartQuotes uses backslash escapes instead of null-escapes # Insert backslashes before escaped "active" characters. - txt = re.sub('(?<=\x00)([-\\\'".`])', r'\\\1', unicode(node)) + txt = re.sub('(?<=\x00)([-\\\'".`])', r'\\\1', str(node)) yield ('plain', txt) def apply(self): |