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 =