From 6a20b184103e52a69e8771641972a35c0dc6e882 Mon Sep 17 00:00:00 2001 From: Michael Sarahan Date: Mon, 27 Aug 2018 20:00:38 -0500 Subject: [PATCH] remove line continuation characters in cpuinfo --- numexpr/cpuinfo.py | 79 +++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/numexpr/cpuinfo.py b/numexpr/cpuinfo.py index d692b9b..861d308 100644 --- a/numexpr/cpuinfo.py +++ b/numexpr/cpuinfo.py @@ -256,16 +256,15 @@ class LinuxCPUInfo(CPUInfoBase): return self.is_PentiumIV() and self.has_sse3() def _is_Nocona(self): - return self.is_Intel() \ - and (self.info[0]['cpu family'] == '6' \ - or self.info[0]['cpu family'] == '15' ) \ - and (self.has_sse3() and not self.has_ssse3()) \ - and re.match(r'.*?\blm\b', self.info[0]['flags']) is not None + return (self.is_Intel() and + self.info[0]['cpu family'] in ('6', '15') and + self.has_sse3() and + re.match(r'.*?\blm\b', self.info[0]['flags']) is not None) def _is_Core2(self): - return self.is_64bit() and self.is_Intel() and \ - re.match(r'.*?Core\(TM\)2\b', \ - self.info[0]['model name']) is not None + return (self.is_64bit() and self.is_Intel() and + re.match(r'.*?Core\(TM\)2\b', + self.info[0]['model name']) is not None) def _is_Itanium(self): return re.match(r'.*?Itanium\b', @@ -659,7 +658,7 @@ class Win32CPUInfo(CPUInfoBase): try: #XXX: Bad style to use so long `try:...except:...`. Fix it! - prgx = re.compile(r"family\s+(?P\d+)\s+model\s+(?P\d+)" \ + prgx = re.compile(r"family\s+(?P\d+)\s+model\s+(?P\d+)" "\s+stepping\s+(?P\d+)", re.IGNORECASE) chnd = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, self.pkey) pnum = 0 @@ -706,20 +705,20 @@ class Win32CPUInfo(CPUInfoBase): return self.is_AMD() and self.info[0]['Family'] == 4 def _is_AMDK5(self): - return self.is_AMD() and self.info[0]['Family'] == 5 \ - and self.info[0]['Model'] in [0, 1, 2, 3] + return (self.is_AMD() and self.info[0]['Family'] == 5 and + self.info[0]['Model'] in [0, 1, 2, 3]) def _is_AMDK6(self): - return self.is_AMD() and self.info[0]['Family'] == 5 \ - and self.info[0]['Model'] in [6, 7] + return (self.is_AMD() and self.info[0]['Family'] == 5 and + self.info[0]['Model'] in [6, 7]) def _is_AMDK6_2(self): - return self.is_AMD() and self.info[0]['Family'] == 5 \ - and self.info[0]['Model'] == 8 + return (self.is_AMD() and self.info[0]['Family'] == 5 and + self.info[0]['Model'] == 8) def _is_AMDK6_3(self): - return self.is_AMD() and self.info[0]['Family'] == 5 \ - and self.info[0]['Model'] == 9 + return (self.is_AMD() and self.info[0]['Family'] == 5 and + self.info[0]['Model'] == 9) def _is_AMDK7(self): return self.is_AMD() and self.info[0]['Family'] == 6 @@ -752,31 +751,31 @@ class Win32CPUInfo(CPUInfoBase): return self.is_Intel() and self.info[0]['Family'] == 5 def _is_PentiumMMX(self): - return self.is_Intel() and self.info[0]['Family'] == 5 \ - and self.info[0]['Model'] == 4 + return (self.is_Intel() and self.info[0]['Family'] == 5 and + self.info[0]['Model'] == 4) def _is_PentiumPro(self): - return self.is_Intel() and self.info[0]['Family'] == 6 \ - and self.info[0]['Model'] == 1 + return (self.is_Intel() and self.info[0]['Family'] == 6 and + self.info[0]['Model'] == 1) def _is_PentiumII(self): - return self.is_Intel() and self.info[0]['Family'] == 6 \ - and self.info[0]['Model'] in [3, 5, 6] + return (self.is_Intel() and self.info[0]['Family'] == 6 and + self.info[0]['Model'] in [3, 5, 6]) def _is_PentiumIII(self): - return self.is_Intel() and self.info[0]['Family'] == 6 \ - and self.info[0]['Model'] in [7, 8, 9, 10, 11] + return (self.is_Intel() and self.info[0]['Family'] == 6 and + self.info[0]['Model'] in [7, 8, 9, 10, 11]) def _is_PentiumIV(self): return self.is_Intel() and self.info[0]['Family'] == 15 def _is_PentiumM(self): - return self.is_Intel() and self.info[0]['Family'] == 6 \ - and self.info[0]['Model'] in [9, 13, 14] + return (self.is_Intel() and self.info[0]['Family'] == 6 and + self.info[0]['Model'] in [9, 13, 14]) def _is_Core2(self): - return self.is_Intel() and self.info[0]['Family'] == 6 \ - and self.info[0]['Model'] in [15, 16, 17] + return (self.is_Intel() and self.info[0]['Family'] == 6 and + self.info[0]['Model'] in [15, 16, 17]) # Varia @@ -788,8 +787,9 @@ class Win32CPUInfo(CPUInfoBase): def _has_mmx(self): if self.is_Intel(): - return (self.info[0]['Family'] == 5 and self.info[0]['Model'] == 4) \ - or (self.info[0]['Family'] in [6, 15]) + return ((self.info[0]['Family'] == 5 and + self.info[0]['Model'] == 4) or + (self.info[0]['Family'] in [6, 15])) elif self.is_AMD(): return self.info[0]['Family'] in [5, 6, 15] else: @@ -797,20 +797,19 @@ class Win32CPUInfo(CPUInfoBase): def _has_sse(self): if self.is_Intel(): - return (self.info[0]['Family'] == 6 and \ - self.info[0]['Model'] in [7, 8, 9, 10, 11]) \ - or self.info[0]['Family'] == 15 + return ((self.info[0]['Family'] == 6 and + self.info[0]['Model'] in [7, 8, 9, 10, 11]) or + self.info[0]['Family'] == 15) elif self.is_AMD(): - return (self.info[0]['Family'] == 6 and \ - self.info[0]['Model'] in [6, 7, 8, 10]) \ - or self.info[0]['Family'] == 15 + return ((self.info[0]['Family'] == 6 and + self.info[0]['Model'] in [6, 7, 8, 10]) or + self.info[0]['Family'] == 15) else: return False def _has_sse2(self): if self.is_Intel(): - return self.is_Pentium4() or self.is_PentiumM() \ - or self.is_Core2() + return self.is_Pentium4() or self.is_PentiumM() or self.is_Core2() elif self.is_AMD(): return self.is_AMD64() else: @@ -858,4 +857,4 @@ if __name__ == "__main__": info.append('%s=%s' % (name[1:], r)) else: info.append(name[1:]) - print('CPU information: ' + ' '.join(info)) \ No newline at end of file + print('CPU information: ' + ' '.join(info)) -- 2.17.1