[PATCH] D67967: [LNT] rename object variables

[Thomas Preud'homme via Phabricator via llvm-commits]

thopre created this revision.
thopre added reviewers: cmatthews, hubert.reinterpretcast, kristof.beyls.
thopre added a parent revision: D67814: [LNT] Python 3 support: adapt to dict method returning views.
thopre added a child revision: D67815: [LNT] Python 3 support: adapt to filter returning an iterator.

Rename variables named object to obj to avoid confusion with the object
type.


https://reviews.llvm.org/D67967

Files:
  lnt/server/ui/filters.py
  lnt/server/ui/util.py


Index: lnt/server/ui/util.py
===================================================================
--- lnt/server/ui/util.py
+++ lnt/server/ui/util.py
@@ -84,7 +84,7 @@
     return ('\n' + prependStr).join(str.splitlines())
 
 
-def pprint(object, useRepr=True):
+def pprint(obj, useRepr=True):
     def recur(ob):
         return pprint(ob, useRepr)
 
@@ -97,16 +97,16 @@
     def pprintArgs(name, args):
         return wrapString(name + '(', ',\n'.join(map(recur, args)), ')')
 
-    if isinstance(object, tuple):
-        return wrapString('(', ',\n'.join(map(recur, object)),
-                          [')', ',)'][len(object) == 1])
-    elif isinstance(object, list):
-        return wrapString('[', ',\n'.join(map(recur, object)), ']')
-    elif isinstance(object, set):
-        return pprintArgs('set', list(object))
-    elif isinstance(object, dict):
+    if isinstance(obj, tuple):
+        return wrapString('(', ', \n'.join(map(recur, obj)),
+                          [')', ',)'][len(obj) == 1])
+    elif isinstance(obj, list):
+        return wrapString('[', ', \n'.join(map(recur, obj)), ']')
+    elif isinstance(obj, set):
+        return pprintArgs('set', list(obj))
+    elif isinstance(obj, dict):
         elts = []
-        for k, v in object.items():
+        for k, v in obj.items():
             kr = recur(k)
             vr = recur(v)
             elts.append('%s : %s' % (kr,
@@ -116,12 +116,12 @@
         return wrapString('{', ',\n'.join(elts), '}')
     else:
         if useRepr:
-            return repr(object)
-        return str(object)
+            return repr(obj)
+        return str(obj)
 
 
-def prefixAndPPrint(prefix, object, useRepr=True):
-    return prefix + prependLines(' ' * len(prefix), pprint(object, useRepr))
+def prefixAndPPrint(prefix, obj, useRepr=True):
+    return prefix + prependLines(' ' * len(prefix), pprint(obj, useRepr))
 
 
 def clamp(v, minVal, maxVal):
Index: lnt/server/ui/filters.py
===================================================================
--- lnt/server/ui/filters.py
+++ lnt/server/ui/filters.py
@@ -73,6 +73,6 @@
 
 
 def register(env):
-    for name, object in globals().items():
+    for name, obj in globals().items():
         if name.startswith('filter_'):
-            env.filters[name[7:]] = object
+            env.filters[name[7:]] = obj


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67967.221548.patch
Type: text/x-patch
Size: 2334 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190924/3671284c/attachment.bin>