Cleanup/simplify code following recent changes.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8358 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

2 files changed, 4 insertions, 8 deletions

diff --git a/docutils/docutils/transforms/__init__.py b/docutils/docutils/transforms/__init__.py
index 992d6d9ba..32c9a840d 100644
--- a/docutils/docutils/transforms/__init__.py
+++ b/docutils/docutils/transforms/__init__.py
@@ -153,8 +153,8 @@ class Transformer(TransformSpec):
         unknown_reference_resolvers = []
         for i in components:
             unknown_reference_resolvers.extend(i.unknown_reference_resolvers)
-        decorated_list = sorted([(f.priority, f) for f in unknown_reference_resolvers])
-        self.unknown_reference_resolvers.extend([f[1] for f in decorated_list])
+        decorated_list = sorted((f.priority, f) for f in unknown_reference_resolvers)
+        self.unknown_reference_resolvers.extend(f[1] for f in decorated_list)
 
     def apply_transforms(self):
         """Apply all of the stored transforms, in priority order."""
diff --git a/docutils/docutils/writers/odf_odt/__init__.py b/docutils/docutils/writers/odf_odt/__init__.py
index fb0dd43cf..5a6db88be 100644
--- a/docutils/docutils/writers/odf_odt/__init__.py
+++ b/docutils/docutils/writers/odf_odt/__init__.py
@@ -51,12 +51,8 @@ IMAGE_NAME_COUNTER = itertools.count()
 try:
     import pygments
     import pygments.lexers
-    if sys.version_info.major >= 3:
-        from .pygmentsformatter import OdtPygmentsProgFormatter, \
-            OdtPygmentsLaTeXFormatter
-    else:
-        from .pygmentsformatter import OdtPygmentsProgFormatter, \
-            OdtPygmentsLaTeXFormatter
+    from .pygmentsformatter import (OdtPygmentsProgFormatter,
+                                    OdtPygmentsLaTeXFormatter)
 except (ImportError, SyntaxError):
     pygments = None