summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2018-11-21 21:46:00 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2018-11-21 21:46:00 +0000
commitdc1bf0076a657d6d67243913d3fed63215816696 (patch)
tree411e3e0e77c6197e6d0890a632529b5900747984
parenta7c7b69520ade5b0f52396e66cfda913590c9d70 (diff)
downloaddocutils-dc1bf0076a657d6d67243913d3fed63215816696.tar.gz
Remove legacy compatibility defs for versions < 2.5.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8239 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/docutils/languages/__init__.py3
-rw-r--r--docutils/docutils/parsers/__init__.py2
-rw-r--r--docutils/docutils/parsers/rst/directives/__init__.py2
-rw-r--r--docutils/docutils/parsers/rst/languages/__init__.py3
-rw-r--r--docutils/docutils/readers/__init__.py2
-rw-r--r--docutils/docutils/writers/__init__.py2
6 files changed, 2 insertions, 12 deletions
diff --git a/docutils/docutils/languages/__init__.py b/docutils/docutils/languages/__init__.py
index b22747d33..b4f015529 100644
--- a/docutils/docutils/languages/__init__.py
+++ b/docutils/docutils/languages/__init__.py
@@ -14,8 +14,7 @@ __docformat__ = 'reStructuredText'
import sys
from docutils.utils import normalize_language_tag
-if sys.version_info < (2,5):
- from docutils._compat import __import__
+
_languages = {}
diff --git a/docutils/docutils/parsers/__init__.py b/docutils/docutils/parsers/__init__.py
index 06198acee..8d9fcfea8 100644
--- a/docutils/docutils/parsers/__init__.py
+++ b/docutils/docutils/parsers/__init__.py
@@ -10,8 +10,6 @@ __docformat__ = 'reStructuredText'
import sys
from docutils import Component
-if sys.version_info < (2,5):
- from docutils._compat import __import__
class Parser(Component):
diff --git a/docutils/docutils/parsers/rst/directives/__init__.py b/docutils/docutils/parsers/rst/directives/__init__.py
index 5720424d3..4278cc057 100644
--- a/docutils/docutils/parsers/rst/directives/__init__.py
+++ b/docutils/docutils/parsers/rst/directives/__init__.py
@@ -15,8 +15,6 @@ import sys
from docutils import nodes
from docutils.utils import split_escaped_whitespace, escape2null, unescape
from docutils.parsers.rst.languages import en as _fallback_language_module
-if sys.version_info < (2,5):
- from docutils._compat import __import__
_directive_registry = {
diff --git a/docutils/docutils/parsers/rst/languages/__init__.py b/docutils/docutils/parsers/rst/languages/__init__.py
index e1985afe4..9506a257b 100644
--- a/docutils/docutils/parsers/rst/languages/__init__.py
+++ b/docutils/docutils/parsers/rst/languages/__init__.py
@@ -15,8 +15,7 @@ __docformat__ = 'reStructuredText'
import sys
from docutils.utils import normalize_language_tag
-if sys.version_info < (2,5):
- from docutils._compat import __import__
+
_languages = {}
diff --git a/docutils/docutils/readers/__init__.py b/docutils/docutils/readers/__init__.py
index a14b7ef14..9df59ab29 100644
--- a/docutils/docutils/readers/__init__.py
+++ b/docutils/docutils/readers/__init__.py
@@ -12,8 +12,6 @@ import sys
from docutils import utils, parsers, Component
from docutils.transforms import universal
-if sys.version_info < (2,5):
- from docutils._compat import __import__
class Reader(Component):
diff --git a/docutils/docutils/writers/__init__.py b/docutils/docutils/writers/__init__.py
index 70b028f81..37550d261 100644
--- a/docutils/docutils/writers/__init__.py
+++ b/docutils/docutils/writers/__init__.py
@@ -14,8 +14,6 @@ import sys
import docutils
from docutils import languages, Component
from docutils.transforms import universal
-if sys.version_info < (2,5):
- from docutils._compat import __import__
class Writer(Component):