refactoring: move i18n related function from osutil into i18n

sphinx/builders/__init__.py

@@ -21,7 +21,8 @@ except ImportError:
 from docutils import nodes
 
 from sphinx.util import i18n, path_stabilize
-from sphinx.util.osutil import SEP, relative_uri, find_catalog
+from sphinx.util.osutil import SEP, relative_uri
+from sphinx.util.i18n import find_catalog
 from sphinx.util.console import bold, darkgreen
 from sphinx.util.parallel import ParallelTasks, SerialTasks, make_chunks, \
     parallel_available

sphinx/builders/gettext.py

@@ -23,7 +23,8 @@ from six import iteritems
 from sphinx.builders import Builder
 from sphinx.util import split_index_msg
 from sphinx.util.nodes import extract_messages, traverse_translatable_index
-from sphinx.util.osutil import safe_relpath, ensuredir, find_catalog, SEP
+from sphinx.util.osutil import safe_relpath, ensuredir, SEP
+from sphinx.util.i18n import find_catalog
 from sphinx.util.console import darkgreen, purple, bold
 from sphinx.locale import pairindextypes
 

sphinx/environment.py

@@ -40,7 +40,8 @@ from sphinx import addnodes
 from sphinx.util import url_re, get_matching_docs, docname_join, split_into, \
     FilenameUniqDict, get_figtype, import_object
 from sphinx.util.nodes import clean_astext, make_refnode, WarningStream, is_translatable
-from sphinx.util.osutil import SEP, find_catalog_files, getcwd, fs_encoding
+from sphinx.util.osutil import SEP, getcwd, fs_encoding
+from sphinx.util.i18n import find_catalog_files
 from sphinx.util.console import bold, purple
 from sphinx.util.matching import compile_matchers
 from sphinx.util.parallel import ParallelTasks, parallel_available, make_chunks

sphinx/transforms.py

@@ -23,7 +23,8 @@ from sphinx.util import split_index_msg
 from sphinx.util.nodes import (
     traverse_translatable_index, extract_messages, LITERAL_TYPE_NODES, IMAGE_TYPE_NODES,
 )
-from sphinx.util.osutil import ustrftime, find_catalog
+from sphinx.util.osutil import ustrftime
+from sphinx.util.i18n import find_catalog
 from sphinx.util.pycompat import indent
 from sphinx.domains.std import (
     make_term_from_paragraph_node,

sphinx/util/i18n.py

@@ -8,7 +8,7 @@
     :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-
+import gettext
 from os import path
 from collections import namedtuple
 
@@ -51,6 +51,26 @@ class CatalogInfo(LocaleFileInfoBase):
                 write_mo(mo, read_po(po, locale))
 
 
+def find_catalog(docname, compaction):
+    if compaction:
+        ret = docname.split(SEP, 1)[0]
+    else:
+        ret = docname
+
+    return ret
+
+
+def find_catalog_files(docname, srcdir, locale_dirs, lang, compaction):
+    if not(lang and locale_dirs):
+        return []
+
+    domain = find_catalog(docname, compaction)
+    files = [gettext.find(domain, path.join(srcdir, dir_), [lang])
+             for dir_ in locale_dirs]
+    files = [path.relpath(f, srcdir) for f in files if f]
+    return files
+
+
 def find_catalog_source_files(locale_dirs, locale, domains=None, gettext_compact=False,
                               force_all=False):
     """

sphinx/util/osutil.py

@@ -17,7 +17,6 @@ import time
 import errno
 import locale
 import shutil
-import gettext
 from os import path
 import contextlib
 
@@ -170,26 +169,6 @@ def safe_relpath(path, start=None):
         return path
 
 
-def find_catalog(docname, compaction):
-    if compaction:
-        ret = docname.split(SEP, 1)[0]
-    else:
-        ret = docname
-
-    return ret
-
-
-def find_catalog_files(docname, srcdir, locale_dirs, lang, compaction):
-    if not(lang and locale_dirs):
-        return []
-
-    domain = find_catalog(docname, compaction)
-    files = [gettext.find(domain, path.join(srcdir, dir_), [lang])
-             for dir_ in locale_dirs]
-    files = [path.relpath(f, srcdir) for f in files if f]
-    return files
-
-
 fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()