[pypy-commit] pypy default: cleanup and DCE

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r62580:900232e06270
Date: 2013-03-20 14:32 -0700
http://bitbucket.org/pypy/pypy/changeset/900232e06270/

Log:	cleanup and DCE

diff --git a/rpython/translator/llsupport/__init__.py b/rpython/translator/llsupport/__init__.py
deleted file mode 100644
diff --git a/rpython/translator/llsupport/test/__init__.py b/rpython/translator/llsupport/test/__init__.py
deleted file mode 100644
diff --git a/rpython/translator/platform/distutils_platform.py b/rpython/translator/platform/distutils_platform.py
--- a/rpython/translator/platform/distutils_platform.py
+++ b/rpython/translator/platform/distutils_platform.py
@@ -89,7 +89,7 @@
         data = ''
         try:
             saved_environ = os.environ.copy()
-            c = stdoutcapture.Capture(mixed_out_err = True)
+            c = stdoutcapture.Capture(mixed_out_err=True)
             try:
                 self._build()
             finally:
diff --git a/rpython/translator/tool/taskengine.py b/rpython/translator/tool/taskengine.py
--- a/rpython/translator/tool/taskengine.py
+++ b/rpython/translator/tool/taskengine.py
@@ -1,7 +1,4 @@
-
-
 class SimpleTaskEngine(object):
-
     def __init__(self):
         self._plan_cache = {}
 
@@ -32,7 +29,7 @@
                 if dep.startswith('??'): # optional
                     dep = dep[2:]
                     if dep not in goals:
-                        continue                
+                        continue
                 if dep.startswith('?'): # suggested
                     dep = dep[1:]
                     if dep in skip:
@@ -40,7 +37,7 @@
                 yield dep
 
         seen = {}
-                        
+
         def consider(subgoal):
             if subgoal in seen:
                 return
@@ -71,7 +68,7 @@
                 else:
                     break
             else:
-                raise RuntimeError, "circular dependecy"
+                raise RuntimeError("circular dependecy")
 
             plan.append(cand)
             for constr in constraints:
@@ -93,6 +90,7 @@
 
     def _depending_on_closure(self, goal):
         d = {}
+
         def track(goal):
             if goal in d:
                 return
@@ -127,10 +125,6 @@
 
     def _event(self, kind, goal, func):
         pass
-    
+
     def _error(self, goal):
         pass
-
-
-        
-        
diff --git a/rpython/translator/tool/tracer.py b/rpython/translator/tool/tracer.py
deleted file mode 100644
--- a/rpython/translator/tool/tracer.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import types, sys
-from rpython.annotator.model import SomeValue, debugname
-from rpython.annotator.annset import AnnotationSet
-from rpython.annotator.annrpython import RPythonAnnotator
-
-indent1 = ['']
-
-def show(n):
-    if isinstance(n, AnnotationSet):
-        return 'heap'
-    elif isinstance(n, RPythonAnnotator):
-        return 'rpyann'
-    else:
-        return repr(n)
-
-def trace(o):
-    if isinstance(o, types.ClassType):
-        for key, value in o.__dict__.items():
-            o.__dict__[key] = trace(value)
-    elif isinstance(o, types.FunctionType):
-        d = {'o': o, 'show': show, 'indent1': indent1, 'stderr': sys.stderr}
-        exec """
-def %s(*args, **kwds):
-    indent, = indent1
-    rargs = [show(a) for a in args]
-    for kw, value in kwds.items():
-        rargs.append('%%s=%%r' %% (kw, value))
-    print >> stderr, indent + %r + '(%%s)' %% ', '.join(rargs)
-    indent1[0] += '|   '
-    try:
-        result = o(*args, **kwds)
-    except Exception, e:
-        indent1[0] = indent
-        print >> stderr, indent + '+--> %%s: %%s' %% (e.__class__.__name__, e)
-        raise
-    indent1[0] = indent
-    if result is not None:
-        print >> stderr, indent + '+-->', show(result)
-    return result
-result = %s
-""" % (o.__name__, o.__name__, o.__name__) in d
-        return d['result']