diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-12-02 17:46:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-02 17:46:50 (GMT) |
| commit | 714d2c0baf5573c32bf709f3d252496c2359b345 (patch) | |
| tree | f7ffeb60639ce62180e9a395f59f3a795f27283f | |
| parent | 2ca40c92d70b926a7f3ed3d04c766044b9fa8267 (diff) | |
| parent | b4f7dace38719ebb9a0f00c44a69f00d3caa5cfe (diff) | |
| download | SCons-714d2c0baf5573c32bf709f3d252496c2359b345.zip SCons-714d2c0baf5573c32bf709f3d252496c2359b345.tar.gz SCons-714d2c0baf5573c32bf709f3d252496c2359b345.tar.bz2 | |
Merge pull request #3485 from mwichmann/more-escapes
fix more Python escape complaints
| -rw-r--r-- | src/engine/SCons/Tool/intelc.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/packaging/msi.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py index 1f3fcea..7550c34 100644 --- a/src/engine/SCons/Tool/intelc.py +++ b/src/engine/SCons/Tool/intelc.py @@ -387,7 +387,7 @@ def get_intel_compiler_top(version, abi): def generate(env, version=None, abi=None, topdir=None, verbose=0): - """Add Builders and construction variables for Intel C/C++ compiler + r"""Add Builders and construction variables for Intel C/C++ compiler to an Environment. args: version: (string) compiler version to use, like "80" @@ -551,7 +551,7 @@ def generate(env, version=None, abi=None, topdir=None, verbose=0): # Look for license file dir # in system environment, registry, and default location. envlicdir = os.environ.get("INTEL_LICENSE_FILE", '') - K = ('SOFTWARE\Intel\Licenses') + K = r'SOFTWARE\Intel\Licenses' try: k = SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, K) reglicdir = SCons.Util.RegQueryValueEx(k, "w_cpp")[0] diff --git a/src/engine/SCons/Tool/packaging/msi.py b/src/engine/SCons/Tool/packaging/msi.py index 0ef18ec..34e4f0f 100644 --- a/src/engine/SCons/Tool/packaging/msi.py +++ b/src/engine/SCons/Tool/packaging/msi.py @@ -224,7 +224,7 @@ def build_wxsfile(target, source, env): # setup function # def create_default_directory_layout(root, NAME, VERSION, VENDOR, filename_set): - """ Create the wix default target directory layout and return the innermost + r""" Create the wix default target directory layout and return the innermost directory. We assume that the XML tree delivered in the root argument already contains |