From 88c2761c085a4b0a6f465e8c7c3e408fd035fd69 Mon Sep 17 00:00:00 2001
From: Martin Holters <martin.holters@hsu-hh.de>
Date: Tue, 8 Oct 2019 17:30:46 +0200
Subject: [PATCH] Drop compat code for `Compat.names` from #493 and #505

---
 README.md        | 2 --
 src/Compat.jl    | 5 -----
 test/old.jl      | 8 ++++++++
 test/runtests.jl | 8 --------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 397ebdf13..c8e0ce49f 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * Three-argument methods `prevind(s,i,n)`, `nextind(s,i,n)` ([#23805]), and `length(s,i,j)` ([#24999]); the latter two replace `chr2ind` and `ind2chr` in Julia 0.7, respectively.
 
-* `Compat.names` supporting keyword arguments for `all` and `imported` ([#25647]).
-
 * `Compat.IOBuffer` supporting keyword arguments ([#25873]).
 
 * `Compat.range` supporting positional and keyword arguments flavors ([#25896]), ([#28708]).
diff --git a/src/Compat.jl b/src/Compat.jl
index 97ace35b9..bcc197ce3 100644
--- a/src/Compat.jl
+++ b/src/Compat.jl
@@ -75,11 +75,6 @@ end
     end
 end
 
-# https://github.com/JuliaLang/julia/pull/25647
-@static if VERSION < v"0.7.0-DEV.3526"
-    names(m; all=false, imported=false) = Base.names(m, all, imported)
-end
-
 if VERSION >= v"0.7.0-DEV.3666"
     import UUIDs
 else
diff --git a/test/old.jl b/test/old.jl
index 3671fce02..2a3c3018f 100644
--- a/test/old.jl
+++ b/test/old.jl
@@ -768,3 +768,11 @@ end
 
 @test repr("text/plain", "string") == "\"string\"" #25990
 @test showable("text/plain", 3.14159) #26089
+
+# 0.7.0-DEV.3526
+module TestNames
+    export foo
+    function bar end
+end
+@test :foo in Compat.names(TestNames)
+@test :bar in Compat.names(TestNames, all=true)
diff --git a/test/runtests.jl b/test/runtests.jl
index a5fcd9d90..d377bcd60 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -104,14 +104,6 @@ module TestUUIDs
     @test uuid4() isa UUID
 end
 
-# 0.7.0-DEV.3526
-module TestNames
-    export foo
-    function bar end
-end
-@test :foo in Compat.names(TestNames)
-@test :bar in Compat.names(TestNames, all=true)
-
 # 0.7.0-DEV.4804
 @test Compat.trunc(pi) == 3.0
 @test Compat.floor(pi) == 3.0