From 250da37a7b279b05a1ac8954b506add1661f194d Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Fri, 13 Oct 2017 23:27:11 +0000
Subject: [PATCH] Remove swift-temp-url script

This has been deprecated since Swift 2.10.0 (Newton) including a
message that it would go away. Let's actually remove it.

Change-Id: I7d3659761c71119363ff2c0c750e37b4c6374a39
Related-Change: Ifa8bf636f20f82db4845b02d1b58699edaa39356
---
 bin/swift-temp-url | 31 -------------------------------
 setup.cfg          |  1 -
 2 files changed, 32 deletions(-)
 delete mode 100755 bin/swift-temp-url

diff --git a/bin/swift-temp-url b/bin/swift-temp-url
deleted file mode 100755
index 6420597f72..0000000000
--- a/bin/swift-temp-url
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from __future__ import print_function
-from gettext import gettext as _
-from sys import argv, exit, stderr
-
-
-if __name__ == '__main__':
-    argv[0:1] = ['swift', 'tempurl']
-    print("", file=stderr)
-    print(_("NOTE: This command is deprecated and will be removed "
-          "in the future. Please use 'swift tempurl' instead."), file=stderr)
-    print("", file=stderr)
-    try:
-        from swiftclient.shell import main
-    except ImportError:
-        print(_("ERROR: python-swiftclient not installed."), file=stderr)
-        exit(1)
-    exit(main(argv))
diff --git a/setup.cfg b/setup.cfg
index f180ffc257..190b59abb0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -61,7 +61,6 @@ scripts =
     bin/swift-recon-cron
     bin/swift-ring-builder
     bin/swift-ring-builder-analyzer
-    bin/swift-temp-url
 
 [extras]
 kms_keymaster =