diff options
author | Googler <noreply@google.com> | 2018-06-06 10:57:08 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-06 10:58:29 -0700 |
commit | 4c72a82ada742bd369185cd07c57f96c497ce440 (patch) | |
tree | f2c8d888c61bf817994286d26f7e272b0c037990 /src/main/java/com/google/devtools/build/lib/rules/python | |
parent | 4b80f2455e7e49a95f3a4c9102a67a57dad52207 (diff) |
Remove python3/ prefix to generated .pyc files.
That makes:
(a) merging PY2 and PY3 .runfiles impossible (which is incorrect anyway) and
(b) generated .py source files incompatible with 2to3 (src_version=PY2) - that's OK as we deprecate 2to3.
RELNOTES: n/a
PiperOrigin-RevId: 199491867
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/python')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java index 7acd86c55a..c524a3034c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java @@ -81,14 +81,14 @@ public final class PythonUtils { } /** - * Get the artifact generated by the 2to3 action. The artifact is in a python3 - * subdirectory to avoid conflicts (eg. when the input file is generated). + * Get the artifact generated by the 2to3 action. + * (There might be conflicts eg. when the input file is generated, but that case is unsupported + * because 2to3 is obsolete). */ private static Artifact get2to3OutputArtifact(RuleContext ruleContext, Artifact input) { ArtifactRoot root = ruleContext.getConfiguration().getGenfilesDirectory(ruleContext.getRule().getRepository()); - PathFragment path = PathFragment.create("python3").getRelative(input.getRootRelativePath()); - return ruleContext.getShareableArtifact(path, root); + return ruleContext.getDerivedArtifact(input.getRootRelativePath(), root); } /** |