[gtk-doc] python: style cleanups



commit 57fd4d90dd57318b262a8fbe795c5a7c389195fa
Author: Stefan Sauer <ensonic users sf net>
Date:   Wed Apr 5 18:27:02 2017 +0200

    python: style cleanups

 gtkdoc-check.in  |    4 ++--
 gtkdoc-mkhtml.in |    2 +-
 gtkdoc-mkman.in  |    4 ++--
 gtkdoc-mkpdf.in  |   10 +++++-----
 gtkdoc-rebase.in |    7 +++++--
 gtkdoc/rebase.py |    3 ---
 6 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gtkdoc-check.in b/gtkdoc-check.in
index 0b9a944..4a54a96 100755
--- a/gtkdoc-check.in
+++ b/gtkdoc-check.in
@@ -25,10 +25,10 @@ sys.path.append('@PYTHON_PACKAGE_DIR@')
 
 from gtkdoc import check, config
 
-if __name__== '__main__':
+if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         description='gtkdoc-check version %s - run documentation unit tests' % config.version)
     parser.add_argument('--version', action='version', version=config.version)
     options = parser.parse_args()
 
-    sys.exit(check.run(options))
\ No newline at end of file
+    sys.exit(check.run(options))
diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in
index 00c7779..9ee85f4 100644
--- a/gtkdoc-mkhtml.in
+++ b/gtkdoc-mkhtml.in
@@ -27,7 +27,7 @@ sys.path.append('@PYTHON_PACKAGE_DIR@')
 
 from gtkdoc import config, mkhtml
 
-if __name__== '__main__':
+if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='gtkdoc-mkhtml version %s - generate documentation in html 
format' % config.version)
     parser.add_argument('--version', action='version', version=config.version)
     parser.add_argument('--verbose', default=False, action='store_true',
diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in
index e2b9192..32cc032 100644
--- a/gtkdoc-mkman.in
+++ b/gtkdoc-mkman.in
@@ -27,7 +27,7 @@ sys.path.append('@PYTHON_PACKAGE_DIR@')
 
 from gtkdoc import config, mkman
 
-if __name__== '__main__':
+if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         description='gtkdoc-mkman version %s - generate documentation in man format' % config.version)
     parser.add_argument('--version', action='version', version=config.version)
@@ -43,4 +43,4 @@ if __name__== '__main__':
 
     options = parser.parse_args()
 
-    sys.exit(mkman.run(options))
\ No newline at end of file
+    sys.exit(mkman.run(options))
diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in
index b6377dc..7363047 100755
--- a/gtkdoc-mkpdf.in
+++ b/gtkdoc-mkpdf.in
@@ -25,20 +25,20 @@ sys.path.append('@PYTHON_PACKAGE_DIR@')
 
 from gtkdoc import config, mkpdf
 
-if __name__== '__main__':
+if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         description='gtkdoc-mkpdf version %s - generate documentation in pdf format' % config.version)
     parser.add_argument('--version', action='version', version=config.version)
     parser.add_argument('--verbose', default=False, action='store_true',
-                help='Print extra output while processing.')
+                        help='Print extra output while processing.')
     parser.add_argument('--path', default=[], action='append',
-                help='Extra source directories.')
+                        help='Extra source directories.')
     parser.add_argument('--imgdir', default=[], action='append',
-                help='Extra image directories.')
+                        help='Extra image directories.')
     parser.add_argument('--uninstalled', action='store_true', default=False,
                         help='???')
     parser.add_argument('args', nargs=2,
-                help='MODULE DRIVER_FILE')
+                        help='MODULE DRIVER_FILE')
 
     options = parser.parse_args()
     sys.exit(mkpdf.run(options))
diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in
index 3b703f5..0f37012 100755
--- a/gtkdoc-rebase.in
+++ b/gtkdoc-rebase.in
@@ -27,10 +27,10 @@ sys.path.append('@PYTHON_PACKAGE_DIR@')
 from gtkdoc import config, rebase
 
 
-if __name__== '__main__':
+if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         description='gtkdoc-rebase version %s - rewrite links in html docs' % config.version)
-    parser.add_argument('--version', action='version', version='config.version')
+    parser.add_argument('--version', action='version', version=config.version)
     parser.add_argument('--html-dir', dest='html_dir', default='')
     parser.add_argument('--other-dir', dest='other_dir', default=[], action='append')
     parser.add_argument('--dest-dir', dest='dest_dir', default='')
@@ -42,4 +42,7 @@ if __name__== '__main__':
 
     options = parser.parse_args()
 
+    if options.html_dir == '':
+        sys.exit("No HTML directory (--html-dir) given.")
+
     sys.exit(rebase.run(options))
diff --git a/gtkdoc/rebase.py b/gtkdoc/rebase.py
index b87ca6a..a32f041 100755
--- a/gtkdoc/rebase.py
+++ b/gtkdoc/rebase.py
@@ -53,9 +53,6 @@ def log(options, *msg):
 def Run(options):
     other_dirs = []
 
-    if (options.html_dir == ''):
-        sys.exit("No HTML directory (--html-dir) given.")
-
     # We scan the directory containing GLib and any directories in GNOME2_PATH
     # first, but these will be overriden by any later scans.
     if "GNOME2_PATH" in os.environ:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]