summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2017-03-14 23:42:27 (GMT)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-19 14:04:32 (GMT)
commit61fcd08247ddfd262123c3a4afad0cd376184811 (patch)
tree65c0ee2103941856b5d3d4b7d1345349d5829e16
parentd1103eeab34c60baf3a1f4b01306977b08bc3d2f (diff)
downloadbuildroot-61fcd08247ddfd262123c3a4afad0cd376184811.tar.gz
buildroot-61fcd08247ddfd262123c3a4afad0cd376184811.tar.bz2
scripts/pycompile: Accomodate latest Python 3 codebase
As of the version 3.6.0 compile_dir() call will treat its 'quiet' argument as a full blown integer rather than a boolean value and perform integer comparison operations such as '<' or '>='. To account for that convert ReportProblem type to be a true derivative of built-in int() and override all of int's rich comparison operators in order to be able to "sniff" for PyCompileError in all possible use-cases The integer value ReportProblem pretends to be is teremined by class variable VALUE which is set to 1. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> Tested-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--support/scripts/pycompile.py59
1 files changed, 46 insertions, 13 deletions
diff --git a/support/scripts/pycompile.py b/support/scripts/pycompile.py
index fde711a..9f7eb9f 100644
--- a/support/scripts/pycompile.py
+++ b/support/scripts/pycompile.py
@@ -1,24 +1,57 @@
#!/usr/bin/env python
-# Wrapper for python2 and python3 around compileall to raise exception
-# when a python byte code generation failed.
-#
-# Inspired from:
-# http://stackoverflow.com/questions/615632/how-to-detect-errors-from-compileall-compile-dir
+'''Wrapper for python2 and python3 around compileall to raise exception
+when a python byte code generation failed.
+Inspired from:
+ http://stackoverflow.com/questions/615632/how-to-detect-errors-from-compileall-compile-dir
+'''
from __future__ import print_function
import sys
import py_compile
import compileall
-class ReportProblem:
- def __nonzero__(self):
- type, value, traceback = sys.exc_info()
- if type is not None and issubclass(type, py_compile.PyCompileError):
- print("Cannot compile %s" %value.file)
+def check_for_errors(comparison):
+ '''Wrap comparison operator with code checking for PyCompileError.
+ If PyCompileError was raised, re-raise it again to abort execution,
+ otherwise perform comparison as expected.
+ '''
+ def operator(self, other):
+ exc_type, value, traceback = sys.exc_info()
+ if exc_type is not None and issubclass(exc_type,
+ py_compile.PyCompileError):
+ print("Cannot compile %s" % value.file)
raise value
- return 1
-report_problem = ReportProblem()
+ return comparison(self, other)
-compileall.compile_dir(sys.argv[1], quiet=report_problem)
+ return operator
+
+class ReportProblem(int):
+ '''Class that pretends to be an int() object but implements all of its
+ comparison operators such that it'd detect being called in
+ PyCompileError handling context and abort execution
+ '''
+ VALUE = 1
+
+ def __new__(cls, *args, **kwargs):
+ return int.__new__(cls, ReportProblem.VALUE, **kwargs)
+
+ @check_for_errors
+ def __lt__(self, other):
+ return ReportProblem.VALUE < other
+
+ @check_for_errors
+ def __eq__(self, other):
+ return ReportProblem.VALUE == other
+
+ def __ge__(self, other):
+ return not self < other
+
+ def __gt__(self, other):
+ return not self < other and not self == other
+
+ def __ne__(self, other):
+ return not self == other
+
+compileall.compile_dir(sys.argv[1], quiet=ReportProblem())