Index: pylib/gyp/xcode_emulation.py |
diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py |
index 2f34bc6f169055e95c87f41881c376a622e345f7..17250714ada07d392d7950253663c3114d2d0453 100644 |
--- a/pylib/gyp/xcode_emulation.py |
+++ b/pylib/gyp/xcode_emulation.py |
@@ -115,6 +115,7 @@ def GetXcodeArchsDefault(): |
global XCODE_ARCHS_DEFAULT_CACHE |
if XCODE_ARCHS_DEFAULT_CACHE: |
return XCODE_ARCHS_DEFAULT_CACHE |
+ # pylint: disable=unpacking-non-sequence |
xcode_version, _ = XcodeVersion() |
if xcode_version < '0500': |
XCODE_ARCHS_DEFAULT_CACHE = XcodeArchsDefault( |
@@ -713,8 +714,8 @@ class XcodeSettings(object): |
# -exported_symbols_list file |
# -Wl,exported_symbols_list file |
# -Wl,exported_symbols_list,file |
- LINKER_FILE = '(\S+)' |
- WORD = '\S+' |
+ LINKER_FILE = r'r(\S+)' |
+ WORD = r'r\S+' |
linker_flags = [ |
['-exported_symbols_list', LINKER_FILE], # Needed for NaCl. |
['-unexported_symbols_list', LINKER_FILE], |
@@ -1026,6 +1027,7 @@ class XcodeSettings(object): |
cache = {} |
cache['BuildMachineOSBuild'] = self._BuildMachineOSBuild() |
+ # pylint: disable=unpacking-non-sequence |
scottmg
2014/11/20 07:29:12
there seems to be enough of these, maybe it would
Shezan Baig (Bloomberg)
2014/11/20 07:48:22
Makes sense, will do.
|
xcode, xcode_build = XcodeVersion() |
cache['DTXcode'] = xcode |
cache['DTXcodeBuild'] = xcode_build |
@@ -1064,6 +1066,7 @@ class XcodeSettings(object): |
project, then the environment variable was empty. Starting with this |
version, Xcode uses the name of the newest SDK installed. |
""" |
+ # pylint: disable=unpacking-non-sequence |
xcode_version, xcode_build = XcodeVersion() |
if xcode_version < '0500': |
return '' |
@@ -1213,13 +1216,13 @@ def XcodeVersion(): |
# In that case this may be a CLT-only install so fall back to |
# checking that version. |
if len(version_list) < 2: |
- raise GypError, "xcodebuild returned unexpected results" |
+ raise GypError("xcodebuild returned unexpected results") |
except: |
version = CLTVersion() |
if version: |
- version = re.match('(\d\.\d\.?\d*)', version).groups()[0] |
+ version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] |
else: |
- raise GypError, "No Xcode or CLT version detected!" |
+ raise GypError("No Xcode or CLT version detected!") |
# The CLT has no build information, so we return an empty string. |
version_list = [version, ''] |
version = version_list[0] |