From 72383f27e233f02f00ed33a7e9790799a1633bfd Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Wed, 24 Dec 2014 10:26:34 -0800 Subject: [PATCH] Bug 1115278 - Fix mach documentation issues; r=glandium terminal.py had an ambiguous |import logging| that was importing mach.logging from Sphinx. We fix it. There was also a poorly formed link in the mach commands documentation. We fix it. --HG-- extra : rebase_source : 12783c69027989ac031d29e4ecbc1ee2f465ffa4 extra : histedit_source : 4283c6cdecc4de8aa7636d0c4cc566daf5142b50 --- python/mach/docs/commands.rst | 2 +- python/mach/mach/terminal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/mach/docs/commands.rst b/python/mach/docs/commands.rst index 3efc281330a4c..af2973dd7e795 100644 --- a/python/mach/docs/commands.rst +++ b/python/mach/docs/commands.rst @@ -23,7 +23,7 @@ The important decorators are as follows: A method decorator that defines an argument to the command. Its arguments are essentially proxied to ArgumentParser.add_argument() -:py:func:`SubCommand ` A method decorator that denotes that the method should be a sub-command to an existing ``@Command``. The decorator takes the parent command name as its first argument and the sub-command name diff --git a/python/mach/mach/terminal.py b/python/mach/mach/terminal.py index cdc3966575e62..9115211e021f8 100644 --- a/python/mach/mach/terminal.py +++ b/python/mach/mach/terminal.py @@ -8,7 +8,7 @@ one place, away from code that is commonly looked at. """ -from __future__ import print_function, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals import logging import sys