diff options
author | Matt Martz <matt@sivel.net> | 2018-02-06 01:25:59 +0300 |
---|---|---|
committer | Matt Martz <matt@sivel.net> | 2018-02-06 01:25:59 +0300 |
commit | ee2e647b9b4a14d9f82d3f0aa01e9f83fa47f50e (patch) | |
tree | 5ad212cc0b146d1b071b43285356c1fe4c66f771 | |
parent | 831c07911398014703010b38bf9ae5f82a76be08 (diff) |
Remove deprecated speedtest_cli.py
-rw-r--r-- | setup.py | 4 | ||||
-rw-r--r-- | speedtest_cli.py | 34 |
2 files changed, 2 insertions, 36 deletions
@@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright 2012-2016 Matt Martz +# Copyright 2012-2018 Matt Martz # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -66,7 +66,7 @@ setup( author_email='matt@sivel.net', url='https://github.com/sivel/speedtest-cli', license='Apache License, Version 2.0', - py_modules=['speedtest', 'speedtest_cli'], + py_modules=['speedtest'], entry_points={ 'console_scripts': [ 'speedtest=speedtest:main', diff --git a/speedtest_cli.py b/speedtest_cli.py deleted file mode 100644 index 1d0fb29..0000000 --- a/speedtest_cli.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# Copyright 2012-2016 Matt Martz -# All Rights Reserved. -# -# 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. - -import warnings - -DEPRECATED_MSG = ('The file speedtest_cli.py has been deprecated in favor of ' - 'speedtest.py\nand is available for download at:\n\n' - 'https://raw.githubusercontent.com/sivel/speedtest-cli/' - 'master/speedtest.py') - - -if __name__ == '__main__': - raise SystemExit(DEPRECATED_MSG) -else: - try: - from speedtest import * - except ImportError: - raise SystemExit(DEPRECATED_MSG) - else: - warnings.warn(DEPRECATED_MSG, UserWarning) |