Merge f3c25fd27a into cc592c8e8a

scour/__init__.py

@@ -16,4 +16,18 @@
 #
 ###############################################################################
 
-__version__ = u'0.35'
+
+from .version import __version__
+
+
+# public API
+from .scour import scourString as scour_string
+from .scour import scourXmlFile as scour_xml_file
+from .scour import sanitizeOptions as options
+from .scour import parse_args
+
+__all__ = ['scour_string', 'scour_xml_file', 'options', 'parse_args']
+
+
+# silence pyflakes
+version = __version__

scour/__main__.py

@@ -0,0 +1,3 @@
+from .scour import run
+
+run()

scour/scour.py

@@ -3647,6 +3647,7 @@ class HeaderedFormatter(optparse.IndentedHelpFormatter):
 # GZ: would prefer this to be in a function or class scope, but tests etc need
 #     access to the defaults anyway
 _options_parser = optparse.OptionParser(
+    prog=APP,
     usage="%prog [INPUT.SVG [OUTPUT.SVG]] [OPTIONS]",
     description=("If the input/output files are not specified, stdin/stdout are used. "
                  "If the input/output files are specified with a svgz extension, "

scour/version.py

@@ -0,0 +1 @@
+__version__ = u'0.35'

setup.py

@@ -33,7 +33,7 @@ Authors:
   - Tobias Oberstein (maintainer)
 """
 
-VERSIONFILE = os.path.join(os.path.dirname(os.path.realpath(__file__)), "scour", "__init__.py")
+VERSIONFILE = os.path.join(os.path.dirname(os.path.realpath(__file__)), "scour", "version.py")
 verstrline = open(VERSIONFILE, "rt").read()
 VSRE = r"^__version__ = u['\"]([^'\"]*)['\"]"
 mo = re.search(VSRE, verstrline, re.M)