Commit so I can pull from trunk

src/calibre/ebooks/conversion/cli.py

@@ -128,9 +128,12 @@ def add_pipeline_options(parser, plumber):
             if rec.level < rec.HIGH:
                 option_recommendation_to_cli_option(add_option, rec)
 
+def option_parser():
+    return OptionParser(usage=USAGE)
+
 def main(args=sys.argv):
     log = Log()
-    parser = OptionParser(usage=USAGE)
+    parser = option_parser()
     if len(args) < 3:
         print_help(parser, log)
         return 1