File graphite2-python3_tests_cornercases.patch of Package graphite2

Overview Repositories Revisions Requests Users Attributes Meta

File graphite2-python3_tests_cornercases.patch of Package graphite2 (Revision 9e8ba369abaa53f17782d9ac87a9d71f)

Currently displaying revision 9e8ba369abaa53f17782d9ac87a9d71f , Show latest

From 3ab48d1e2ba14c3369f7b8649a49fec601382bc4 Mon Sep 17 00:00:00 2001
From: Tim Eves <tim_eves@sil.org>
Date: Wed, 18 Oct 2017 16:09:52 +0700
Subject: [PATCH] Fix a few python2 & 3 corner cases

---
 tests/fnttxtrender |  2 +-
 tests/jsoncmp      | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

Index: graphite-1.3.10/tests/fnttxtrender
===================================================================
--- graphite-1.3.10.orig/tests/fnttxtrender
+++ graphite-1.3.10/tests/fnttxtrender
@@ -248,7 +248,7 @@ for label, words in reader :
         l = makelabel(label, count, wcount)
         if cjson is not None and cmpgls(gls[0], cjson[l][0], opts.epsilon) :
             errors += 1
-            print l + " Failed"
+            print(l + " Failed")
         if opts.quiet : continue
         if log is None :
             log = JsonLog(outfile, fpaths, opts, args)
Index: graphite-1.3.10/tests/jsoncmp
===================================================================
--- graphite-1.3.10.orig/tests/jsoncmp
+++ graphite-1.3.10/tests/jsoncmp
@@ -1,11 +1,10 @@
 #!/usr/bin/python
 from __future__ import print_function, unicode_literals
-from itertools import imap
 import sys, json, operator, re
 
 def walktree(tree, path="", parent=None) :
-    if isinstance(tree, (list,dict)):   
-        ixs = sorted(tree.iteritems(), key=operator.itemgetter(0)) if isinstance(tree, dict) else enumerate(tree)
+    if isinstance(tree, (list,dict)):
+        ixs = sorted(tree.items(), key=operator.itemgetter(0)) if isinstance(tree, dict) else enumerate(tree)
         for k,v in ixs :
             for y in walktree(v, "{0}/{1!s}".format(path, k), tree) :
                 yield y
@@ -67,7 +66,7 @@ def _compare(t1, t2):
 def compare(j1, j2) :
     trimtelemetry(j1)
     trimtelemetry(j2)
-    return all(imap(_compare, walktree(j1), walktree(j2)))
+    return all(map(_compare, walktree(j1), walktree(j2)))
 
 try:
     r1 = canonids(readjson(sys.argv[1]))
@@ -85,7 +84,3 @@ res = compare(r1, r2)
 if res :
     sys.exit(0)
 sys.exit(1)
-
-
-        
-

Places

File graphite2-python3_tests_cornercases.patch of Package graphite2 (Revision 9e8ba369abaa53f17782d9ac87a9d71f)

Places