2 files changed, 4 insertions, 22 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
index da274e27ea..836c778112 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
@@ -442,16 +442,8 @@ public final class SkylarkRuleContext {
   }
 
   @SkylarkCallable(doc =
-      "Creates a new file object, derived from the given file and suffix. " + DOC_NEW_FILE_TAIL
-      + " Deprecated.")
-  public Artifact newFileSuffix(Artifact baseArtifact, String suffix) {
-    return newFile(baseArtifact, baseArtifact.getRootRelativePath().getBaseName() + suffix);
-  }
-
-  @SkylarkCallable(doc =
       "Creates a new file object in the same directory as the original file. "
       + DOC_NEW_FILE_TAIL)
-
   public Artifact newFile(Artifact baseArtifact, String newBaseName) {
     PathFragment original = baseArtifact.getRootRelativePath();
     PathFragment fragment = original.replaceName(newBaseName);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
index 1a37c2954e..9259ad7f45 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
@@ -294,22 +294,12 @@ public class SkylarkRuleContextTest extends SkylarkTestCase {
     assertEquals("foo/t.exe.params", fragment.getPathString());
   }
 
-  public void testParamFile() throws Exception {
-    SkylarkRuleContext ruleContext = createRuleContext("//foo:foo");
-    Object result =
-        evalRuleContextCode(
-            ruleContext, "ruleContext.new_file_suffix(ruleContext.files.tools[0], '.params')");
-    PathFragment fragment = ((Artifact) result).getRootRelativePath();
-    assertEquals("foo/t.exe.params", fragment.getPathString());
-  }
-
-  // new_file_suffix() is deprecated. This test will be removed after the next blaze release (not
-  // later than end of August, 2015).
   public void testParamFileSuffix() throws Exception {
     SkylarkRuleContext ruleContext = createRuleContext("//foo:foo");
-    Object result =
-        evalRuleContextCode(
-            ruleContext, "ruleContext.new_file_suffix(ruleContext.files.tools[0], '.params')");
+    Object result = evalRuleContextCode(
+        ruleContext,
+        "ruleContext.new_file(ruleContext.files.tools[0], "
+        + "ruleContext.files.tools[0].basename + '.params')");
     PathFragment fragment = ((Artifact) result).getRootRelativePath();
     assertEquals("foo/t.exe.params", fragment.getPathString());
   }