fixed flake errors

This commit is contained in:
Gregory Becker 2016-07-20 11:52:16 -07:00
parent 7db4170062
commit 412618d531
2 changed files with 5 additions and 10 deletions

View File

@ -76,7 +76,6 @@
will be responsible for compiler detection. will be responsible for compiler detection.
""" """
import os import os
import imp
import inspect import inspect
from llnl.util.lang import memoized, list_modules, key_ordering from llnl.util.lang import memoized, list_modules, key_ordering
@ -206,15 +205,12 @@ def detect(self):
""" """
raise NotImplementedError() raise NotImplementedError()
def __repr__(self): def __repr__(self):
return self.__str__() return self.__str__()
def __str__(self): def __str__(self):
return self.name return self.name
def _cmp_key(self): def _cmp_key(self):
t_keys = ''.join(str(t._cmp_key()) for t in t_keys = ''.join(str(t._cmp_key()) for t in
sorted(self.targets.values())) sorted(self.targets.values()))
@ -343,6 +339,7 @@ def to_dict(self):
d['version'] = self.version d['version'] = self.version
return d return d
@key_ordering @key_ordering
class Arch(object): class Arch(object):
"""Architecture is now a class to help with setting attributes. """Architecture is now a class to help with setting attributes.
@ -383,11 +380,9 @@ def __str__(self):
else: else:
return '' return ''
def __contains__(self, string): def __contains__(self, string):
return string in str(self) return string in str(self)
def _cmp_key(self): def _cmp_key(self):
if isinstance(self.platform, Platform): if isinstance(self.platform, Platform):
platform = self.platform.name platform = self.platform.name