Merge lp:~myint/restview/trunk into lp:~mgedmin/restview/trunk

[Steven Myint]

This adds a "--strict" option. I find this useful since I don't have to additionally use "rst2html" to check for syntax errors.

[Marius Gedminas (mgedmin)]

Thanks, merged.

I find that Launchpad's UI, as well as Bazaar, get me down. I'll move restview to Github in the neear future.

review: Approve

[Steven Myint (myint)]

Great! On the rare occasion that I log in to Launchpad, I have to relearn how to use the interface.

=== modified file 'src/restview/restviewhttp.py'
--- src/restview/restviewhttp.py	2012-12-22 14:20:31 +0000
+++ src/restview/restviewhttp.py	2013-03-23 14:15:25 +0000
@@ -305,6 +305,8 @@
     css_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                             'default.css')
 
+    strict = None
+
     def __init__(self, root, command=None):
         self.root = root
         self.root_mtime = os.stat(root).st_mtime
@@ -341,6 +343,10 @@
                                 'embed_stylesheet': True}
         else:
             settings_overrides = {}
+
+        if self.strict:
+            settings_overrides['halt_level'] = 1
+
         try:
             docutils.core.publish_string(rest_input, writer=writer,
                                          settings_overrides=settings_overrides)
@@ -497,6 +503,9 @@
     parser.add_option('--css',
                       help='use the specified stylesheet',
                       action='store', dest='css_path', default=None)
+    parser.add_option('--strict',
+                      help='halt at the slightest problem',
+                      action='store_true', default=False)
     opts, args = parser.parse_args(sys.argv[1:])
     if not args and not opts.execute:
         parser.error("at least one argument expected")
@@ -518,6 +527,9 @@
         else:
             server.css_path = opts.css_path
             server.css_url = None
+
+    server.strict = opts.strict
+
     if opts.listen:
         try:
             server.local_address = parse_address(opts.listen)