Commit0dff252

committed

Merge pull request#6427 from jkseppan/pdf-dict-order

MNT: Output pdf dicts in deterministic order

2 parents927631e +9dfb35d commit0dff252Copy full SHA for 0dff252

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`importwarnings`
`19`	`19`	`importzlib`
`20`	`20`	`fromioimportBytesIO`
	`21`	`+fromfunctoolsimporttotal_ordering`
`21`	`22`
`22`	`23`	`importnumpyasnp`
`23`	`24`	`frommatplotlib.externals.siximportunichr`
`@@ -182,8 +183,8 @@ def pdfRepr(obj):`
`182`	`183`	`# represented as Name objects.`
`183`	`184`	`elifisinstance(obj,dict):`
`184`	`185`	`r= [b"<<"]`
`185`		`-r.extend([Name(key).pdfRepr()+b" "+pdfRepr(val)`
`186`		`-forkey,valinsix.iteritems(obj)])`
	`186`	`+r.extend([Name(key).pdfRepr()+b" "+pdfRepr(obj[key])`
	`187`	`+forkeyinsorted(obj)])`
`187`	`188`	`r.append(b">>")`
`188`	`189`	`returnfill(r)`
`189`	`190`
`@@ -243,6 +244,7 @@ def write(self, contents, file):`
`243`	`244`	`write(b"\nendobj\n")`
`244`	`245`
`245`	`246`
	`247`	`+@total_ordering`
`246`	`248`	`className(object):`
`247`	`249`	`"""PDF name object."""`
`248`	`250`	`__slots__= ('name',)`
`@@ -262,6 +264,15 @@ def __repr__(self):`
`262`	`264`	`def__str__(self):`
`263`	`265`	`return'/'+six.text_type(self.name)`
`264`	`266`
	`267`	`+def__eq__(self,other):`
	`268`	`+returnisinstance(other,Name)andself.name==other.name`
	`269`	`+`
	`270`	`+def__lt__(self,other):`
	`271`	`+returnisinstance(other,Name)andself.name<other.name`
	`272`	`+`
	`273`	`+def__hash__(self):`
	`274`	`+returnhash(self.name)`
	`275`	`+`
`265`	`276`	`@staticmethod`
`266`	`277`	`defhexify(match):`
`267`	`278`	`return'#%02x'%ord(match.group())`

Comments

(0)