Mercurial > moin > 2.0

changeset 203:1d416427b7be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
items: do some imports globally
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 30 Apr 2011 16:39:48 +0200
parents 9ffa82e550ba
children af274db0ed53
files MoinMoin/items/__init__.py
diffstat 1 files changed, 3 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/items/__init__.py	Sat Apr 30 16:06:18 2011 +0200
+++ b/MoinMoin/items/__init__.py	Sat Apr 30 16:39:48 2011 +0200
@@ -24,6 +24,9 @@
 from MoinMoin.security.textcha import TextCha, TextChaizedForm, TextChaValid
 from MoinMoin.util.forms import make_generator
 from MoinMoin.util.mimetype import MimeType
+from MoinMoin.util.mime import Type, type_moin_document
+from MoinMoin.util.tree import moin_page, html, xlink, docbook
+from MoinMoin.util.iri import Iri
 from MoinMoin.util.crypto import cache_key
 
 try:
@@ -180,9 +183,6 @@
             # FROM_mimetype --> DOM
             # if so we perform the transformation, otherwise we don't
             from MoinMoin.converter import default_registry as reg
-            from MoinMoin.util.iri import Iri
-            from MoinMoin.util.mime import Type, type_moin_document
-            from MoinMoin.util.tree import moin_page
             input_conv = reg.get(Type(self.mimetype), type_moin_document)
             if not input_conv:
                 raise TypeError("We cannot handle the conversion from %s to the DOM tree" % self.mimetype)
@@ -208,8 +208,6 @@
 
     def _expand_document(self, doc):
         from MoinMoin.converter import default_registry as reg
-        from MoinMoin.util.iri import Iri
-        from MoinMoin.util.mime import type_moin_document
         include_conv = reg.get(type_moin_document, type_moin_document, includes='expandall')
         macro_conv = reg.get(type_moin_document, type_moin_document, macros='expandall')
         link_conv = reg.get(type_moin_document, type_moin_document, links='extern',
@@ -227,8 +225,6 @@
 
     def _render_data(self):
         from MoinMoin.converter import default_registry as reg
-        from MoinMoin.util.mime import Type, type_moin_document
-        from MoinMoin.util.tree import html
         include_conv = reg.get(type_moin_document, type_moin_document, includes='expandall')
         macro_conv = reg.get(type_moin_document, type_moin_document, macros='expandall')
         # TODO: Real output format
@@ -248,7 +244,6 @@
         return out
 
     def _render_data_xml(self):
-        from MoinMoin.util.tree import moin_page, xlink, html
         doc = self.internal_representation()
 
         from array import array
@@ -1039,8 +1034,6 @@
 
     def _render_data_highlight(self):
         from MoinMoin.converter import default_registry as reg
-        from MoinMoin.util.mime import Type, type_moin_document
-        from MoinMoin.util.tree import html
         data_text = self.data_storage_to_internal(self.data)
         # TODO: use registry as soon as it is in there
         from MoinMoin.converter.pygments_in import Converter as PygmentsConverter
@@ -1098,9 +1091,6 @@
             raise StorageError("unsupported content object: %r" % data)
 
         from MoinMoin.converter import default_registry as reg
-        from MoinMoin.util.iri import Iri
-        from MoinMoin.util.mime import Type, type_moin_document
-        from MoinMoin.util.tree import moin_page
 
         input_conv = reg.get(Type(self.mimetype), type_moin_document)
         item_conv = reg.get(type_moin_document, type_moin_document,
@@ -1180,8 +1170,6 @@
     def _convert(self, doc):
         from emeraldtree import ElementTree as ET
         from MoinMoin.converter import default_registry as reg
-        from MoinMoin.util.mime import Type, type_moin_document
-        from MoinMoin.util.tree import docbook, xlink
 
         doc = self._expand_document(doc)