nmbug-status: Anchor with h3 ids instead of a names

[notmuch] / devel / nmbug / nmbug-status
diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status

index 6aa258325fa285c3854cb10c95a7540efa196b08..40e68962d111ee0ce35a5813daa544f7857e8d9b 100755 (executable)
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -5,7 +5,6 @@
  # dependencies
  #       - python 2.6 for json
  #       - argparse; either python 2.7, or install separately
-#       - collections.OrderedDict; python 2.7
  
  from __future__ import print_function
  from __future__ import unicode_literals
@@ -30,6 +29,25 @@ _ENCODING = locale.getpreferredencoding() or sys.getdefaultencoding()
  _PAGES = {}
  
  
+if not hasattr(collections, 'OrderedDict'):  # Python 2.6 or earlier
+    class _OrderedDict (dict):
+        "Just enough of a stub to get through Page._get_threads"
+        def __init__(self, *args, **kwargs):
+            super(_OrderedDict, self).__init__(*args, **kwargs)
+            self._keys = []  # record key order
+
+        def __setitem__(self, key, value):
+            super(_OrderedDict, self).__setitem__(key, value)
+            self._keys.append(key)
+
+        def __values__(self):
+            for key in self._keys:
+                yield self[key]
+
+
+    collections.OrderedDict = _OrderedDict
+
+
  def read_config(path=None, encoding=None):
      "Read config from json file"
      if not encoding:
@@ -159,7 +177,7 @@ class HtmlPage (Page):
          stream.write('</ul>\n')
  
      def _write_view_header(self, view, stream):
-        stream.write('<h3><a name="{title}" />{title}</h3>\n'.format(**view))
+        stream.write('<h3 id="{title}">{title}</h3>\n'.format(**view))
          if 'comment' in view:
              stream.write(view['comment'])
              stream.write('\n')
@@ -179,12 +197,14 @@ class HtmlPage (Page):
          for thread in threads:
              for message_display_data in thread:
                  stream.write((
-                    '<tr><td>{date}\n'
-                    '</td><td>{message-id-term}\n'
-                    '</td></tr>\n'
-                    '<tr><td>{from}\n'
-                    '</td><td>{subject}\n'
-                    '</td></tr>\n'
+                    '<tr>\n'
+                    '  <td>{date}</td>\n'
+                    '  <td>{message-id-term}</td>\n'
+                    '</tr>\n'
+                    '<tr>\n'
+                    '  <td>{from}</td>\n'
+                    '  <td>{subject}</td>\n'
+                    '</tr>\n'
                      ).format(**message_display_data))
              if thread != threads[-1]:
                  stream.write('<tr><td colspan="2"><br /></td></tr>\n')
@@ -207,9 +227,8 @@ class HtmlPage (Page):
  
  _PAGES['text'] = Page()
  _PAGES['html'] = HtmlPage(
-    header='''<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    header='''<!DOCTYPE html>
+<html lang="en">
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <title>Notmuch Patches</title>