Attachment 'sphinx.diff'

Download

   1 Index: sphinx-1.2.3+dfsg/sphinx/util/jsdump.py
   2 ===================================================================
   3 --- sphinx-1.2.3+dfsg.orig/sphinx/util/jsdump.py
   4 +++ sphinx-1.2.3+dfsg/sphinx/util/jsdump.py
   5 @@ -87,11 +87,13 @@ def dumps(obj, key=False):
   6      elif isinstance(obj, (int, long, float)):
   7          return str(obj)
   8      elif isinstance(obj, dict):
   9 -        return '{%s}' % ','.join('%s:%s' % (
  10 +        return '{%s}' % ','.join(sorted('%s:%s' % (
  11              dumps(key, True),
  12              dumps(value)
  13 -        ) for key, value in obj.iteritems())
  14 -    elif isinstance(obj, (tuple, list, set)):
  15 +        ) for key, value in obj.iteritems()))
  16 +    elif isinstance(obj, set):
  17 +        return '[%s]' % ','.join(sorted(dumps(x) for x in obj))
  18 +    elif isinstance(obj, (tuple, list)):
  19          return '[%s]' % ','.join(dumps(x) for x in obj)
  20      elif isinstance(obj, basestring):
  21          return encode_string(obj)
  22 Index: sphinx-1.2.3+dfsg/sphinx/search/__init__.py
  23 ===================================================================
  24 --- sphinx-1.2.3+dfsg.orig/sphinx/search/__init__.py
  25 +++ sphinx-1.2.3+dfsg/sphinx/search/__init__.py
  26 @@ -268,13 +268,13 @@ class IndexBuilder(object):
  27                      if fn in fn2index:
  28                          rv[k] = fn2index[fn]
  29                  else:
  30 -                    rv[k] = [fn2index[fn] for fn in v if fn in fn2index]
  31 +                    rv[k] = sorted([fn2index[fn] for fn in v if fn in fn2index])
  32          return rvs
  33  
  34      def freeze(self):
  35          """Create a usable data structure for serializing."""
  36 -        filenames = self._titles.keys()
  37 -        titles = self._titles.values()
  38 +        filenames = sorted(self._titles.keys())
  39 +        titles = sorted(self._titles.values())
  40          fn2index = dict((f, i) for (i, f) in enumerate(filenames))
  41          terms, title_terms = self.get_terms(fn2index)
  42  
  43 Index: sphinx-1.2.3+dfsg/sphinx/builders/html.py
  44 ===================================================================
  45 --- sphinx-1.2.3+dfsg.orig/sphinx/builders/html.py
  46 +++ sphinx-1.2.3+dfsg/sphinx/builders/html.py
  47 @@ -806,9 +806,9 @@ class StandaloneHTMLBuilder(Builder):
  48                       % (self.config.project, self.config.version)
  49                      ).encode('utf-8'))
  50              compressor = zlib.compressobj(9)
  51 -            for domainname, domain in self.env.domains.iteritems():
  52 +            for domainname, domain in sorted(self.env.domains.iteritems()):
  53                  for name, dispname, type, docname, anchor, prio in \
  54 -                        domain.get_objects():
  55 +                        sorted(domain.get_objects()):
  56                      if anchor.endswith(name):
  57                          # this can shorten the inventory by as much as 25%
  58                          anchor = anchor[:-len(name)] + '$'

Attached Files

To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.
  • [get | view] (2015-01-26 18:10:14, 2.7 KB) [[attachment:sphinx.diff]]
 All files | Selected Files: delete move to page copy to page

You are not allowed to attach a file to this page.