diff options
author | Simon Warta <[email protected]> | 2017-04-11 00:42:16 +0200 |
---|---|---|
committer | Simon Warta <[email protected]> | 2017-04-11 00:42:16 +0200 |
commit | e94e7c41aaf556753b583c9819ba0bd1a39b8cf4 (patch) | |
tree | 39ec450e6fb13f633eeee81d2e6e4d9c713eb626 | |
parent | 2f1b5f55d736715c6c15a117bcb70ae582cc7920 (diff) |
configure: remove internal sorting of ModuleInfo object
before, python3 configure.py --amalgamation failed with "TypeError:
unorderable types: ModuleInfo() < ModuleInfo()" as __cmp__ is not state
of the art anymore
(https://docs.python.org/release/3.0.1/whatsnew/3.0.html#ordering-
comparisons)
-rwxr-xr-x | configure.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configure.py b/configure.py index df2c19cd6..709610ce2 100755 --- a/configure.py +++ b/configure.py @@ -828,13 +828,6 @@ class ModuleInfo(InfoObject): logging.error("Module '%s', dep of '%s', does not exist" % ( missing, self.basename)) - def __cmp__(self, other): - if self.basename < other.basename: - return -1 - if self.basename == other.basename: - return 0 - return 1 - class ModulePolicyInfo(InfoObject): def __init__(self, infofile): @@ -2356,7 +2349,7 @@ class AmalgamationGenerator(object): return target def _isas_for_target(self, target): - for mod in sorted(self._modules): + for mod in sorted(self._modules, key=lambda module: module.basename): # Only first module for target is considered. Does this make sense? if self._target_for_module(mod) == target: out = set() @@ -2417,7 +2410,7 @@ class AmalgamationGenerator(object): for target, _ in amalgamation_sources.items(): headers_written[target] = included_in_headers.copy() - for mod in sorted(self._modules): + for mod in sorted(self._modules, key=lambda module: module.basename): tgt = self._target_for_module(mod) for src in sorted(mod.source): with open(src, 'r') as f: |