merge with trunk

sphinx/application.py

@@ -30,8 +30,9 @@ from sphinx.domains import ObjType, all_domains
 from sphinx.domains.std import GenericObject, Target, StandardDomain
 from sphinx.builders import BUILTIN_BUILDERS
 from sphinx.environment import BuildEnvironment, SphinxStandaloneReader
-from sphinx.util import ENOENT, pycompat  # pycompat imported for side-effects
+from sphinx.util import pycompat  # pycompat imported for side-effects
 from sphinx.util.tags import Tags
+from sphinx.util.osutil import ENOENT
 from sphinx.util.console import bold
 
 

sphinx/builders/__init__.py

@@ -10,12 +10,11 @@
 """
 
 import os
-import gettext
 from os import path
 
 from docutils import nodes
 
-from sphinx.util.os import SEP, relative_uri
+from sphinx.util.osutil import SEP, relative_uri
 from sphinx.util.console import bold, purple, darkgreen, term_width_line
 
 # side effect: registers roles and directives

sphinx/builders/changes.py

@@ -15,9 +15,9 @@ from cgi import escape
 
 from sphinx import package_dir
 from sphinx.util import copy_static_entry
-from sphinx.util.os import ensuredir, os_path
 from sphinx.theming import Theme
 from sphinx.builders import Builder
+from sphinx.util.osutil import ensuredir, os_path
 from sphinx.util.console import bold
 
 

sphinx/builders/epub.py

@@ -18,7 +18,7 @@ import zipfile
 from docutils import nodes
 
 from sphinx.builders.html import StandaloneHTMLBuilder
-from sphinx.util.os import EEXIST
+from sphinx.util.osutil import EEXIST
 
 
 # (Fragment) templates from which the metainfo files content.opf, toc.ncx,

sphinx/builders/html.py

@@ -30,8 +30,8 @@ from docutils.readers.doctree import Reader as DoctreeReader
 
 from sphinx import package_dir, __version__
 from sphinx.util import copy_static_entry
-from sphinx.util.os import SEP, os_path, relative_uri, ensuredir, movefile, \
+from sphinx.util.osutil import SEP, os_path, relative_uri, ensuredir, \
-     ustrftime, copyfile
+     movefile, ustrftime, copyfile
 from sphinx.util.nodes import inline_all_toctrees
 from sphinx.util.matching import patmatch, compile_matchers
 from sphinx.util.pycompat import any

sphinx/builders/latex.py

@@ -19,10 +19,10 @@ from docutils.frontend import OptionParser
 
 from sphinx import package_dir, addnodes
 from sphinx.util import texescape
-from sphinx.util.os import SEP, copyfile
 from sphinx.builders import Builder
 from sphinx.environment import NoUri
 from sphinx.util.nodes import inline_all_toctrees
+from sphinx.util.osutil import SEP, copyfile
 from sphinx.util.console import bold, darkgreen
 from sphinx.writers.latex import LaTeXWriter
 

sphinx/builders/text.py

@@ -14,8 +14,8 @@ from os import path
 
 from docutils.io import StringOutput
 
-from sphinx.util.os import ensuredir, os_path
 from sphinx.builders import Builder
+from sphinx.util.osutil import ensuredir, os_path
 from sphinx.writers.text import TextWriter
 
 

sphinx/config.py

@@ -14,7 +14,7 @@ import re
 from os import path
 
 from sphinx.errors import ConfigError
-from sphinx.util.os import make_filename
+from sphinx.util.osutil import make_filename
 
 nonascii_re = re.compile(r'[\x80-\xff]')
 

sphinx/domains/c.py

@@ -19,7 +19,7 @@ from sphinx.roles import XRefRole
 from sphinx.locale import l_
 from sphinx.domains import Domain, ObjType
 from sphinx.directives import ObjectDescription
-from sphinx.util import make_refnode
+from sphinx.util.nodes import make_refnode
 from sphinx.util.docfields import Field, TypedField
 
 

sphinx/domains/python.py

@@ -19,7 +19,7 @@ from sphinx.roles import XRefRole
 from sphinx.locale import l_
 from sphinx.domains import Domain, ObjType
 from sphinx.directives import ObjectDescription
-from sphinx.util import make_refnode
+from sphinx.util.nodes import make_refnode
 from sphinx.util.compat import Directive
 from sphinx.util.docfields import Field, GroupedField, TypedField
 

sphinx/domains/std.py

@@ -11,7 +11,7 @@
 
 import re
 
-from docutils import nodes, utils
+from docutils import nodes
 from docutils.parsers.rst import directives
 
 from sphinx import addnodes
@@ -19,7 +19,8 @@ from sphinx.roles import XRefRole
 from sphinx.locale import l_
 from sphinx.domains import Domain, ObjType
 from sphinx.directives import ObjectDescription
-from sphinx.util import make_refnode, ws_re
+from sphinx.util import ws_re
+from sphinx.util.nodes import make_refnode
 from sphinx.util.compat import Directive
 
 

sphinx/environment.py

@@ -36,8 +36,8 @@ from docutils.transforms.parts import ContentsFilter
 from sphinx import addnodes
 from sphinx.util import url_re, get_matching_docs, docname_join, \
      FilenameUniqDict
-from sphinx.util.os import movefile, SEP, ustrftime
 from sphinx.util.nodes import clean_astext, make_refnode
+from sphinx.util.osutil import movefile, SEP, ustrftime
 from sphinx.util.matching import compile_matchers
 from sphinx.errors import SphinxError, ExtensionError
 

sphinx/ext/autosummary/generate.py

@@ -27,8 +27,8 @@ from jinja2 import FileSystemLoader, TemplateNotFound
 from jinja2.sandbox import SandboxedEnvironment
 
 from sphinx.ext.autosummary import import_by_name, get_documenter
-from sphinx.util.os import ensuredir
 from sphinx.jinja2glue import BuiltinTemplateLoader
+from sphinx.util.osutil import ensuredir
 
 def main(argv=sys.argv):
     usage = """%prog [OPTIONS] SOURCEFILE ..."""

sphinx/ext/graphviz.py

@@ -24,7 +24,7 @@ from docutils import nodes
 from docutils.parsers.rst import directives
 
 from sphinx.errors import SphinxError
-from sphinx.util.os import ensuredir, ENOENT, EPIPE
+from sphinx.util.osutil import ensuredir, ENOENT, EPIPE
 from sphinx.util.compat import Directive
 
 

sphinx/ext/pngmath.py

@@ -23,8 +23,8 @@ except ImportError:
 from docutils import nodes
 
 from sphinx.errors import SphinxError
-from sphinx.util.os import ensuredir, ENOENT
 from sphinx.util.png import read_png_depth, write_png_depth
+from sphinx.util.osutil import ensuredir, ENOENT
 from sphinx.ext.mathbase import setup_math as mathbase_setup, wrap_displaymath
 
 class MathExtError(SphinxError):

sphinx/ext/viewcode.py

@@ -12,8 +12,8 @@
 from docutils import nodes
 
 from sphinx import addnodes
-from sphinx.util import make_refnode
 from sphinx.pycode import ModuleAnalyzer
+from sphinx.util.nodes import make_refnode
 
 
 def doctree_read(app, doctree):

sphinx/jinja2glue.py

@@ -17,8 +17,8 @@ from jinja2 import FileSystemLoader, BaseLoader, TemplateNotFound, \
 from jinja2.utils import open_if_exists
 from jinja2.sandbox import SandboxedEnvironment
 
-from sphinx.util.os import mtimes_of_files
 from sphinx.application import TemplateBridge
+from sphinx.util.osutil import mtimes_of_files
 
 
 def _tobool(val):

sphinx/quickstart.py

@@ -15,7 +15,7 @@ from os import path
 TERM_ENCODING = getattr(sys.stdin, 'encoding', None)
 
 from sphinx import __version__
-from sphinx.util.os import make_filename
+from sphinx.util.osutil import make_filename
 from sphinx.util.console import purple, bold, red, turquoise, \
      nocolor, color_terminal
 from sphinx.util import texescape

sphinx/util/__init__.py

@@ -29,7 +29,7 @@ from sphinx.errors import PycodeError
 
 # import other utilities; partly for backwards compatibility, so don't
 # prune unused ones indiscriminately
-from sphinx.util.os import SEP, os_path, relative_uri, ensuredir, walk, \
+from sphinx.util.osutil import SEP, os_path, relative_uri, ensuredir, walk, \
      mtimes_of_files, movefile, copyfile, copytimes, make_filename, ustrftime
 from sphinx.util.nodes import nested_parse_with_titles, split_explicit_title, \
      explicit_title_re, caption_ref_re

sphinx/util/osutil.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    sphinx.util.os
+    sphinx.util.osutil
-    ~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~
 
     Operating system-related utility functions for Sphinx.
 

sphinx/writers/latex.py

@@ -23,7 +23,7 @@ from sphinx import addnodes
 from sphinx import highlighting
 from sphinx.errors import SphinxError
 from sphinx.locale import admonitionlabels, versionlabels
-from sphinx.util.os import ustrftime
+from sphinx.util.osutil import ustrftime
 from sphinx.util.texescape import tex_escape_map
 from sphinx.util.smartypants import educateQuotesLatex