Intermediate changes

2 files changed, 0 insertions, 202 deletions

diff --git a/contrib/python/python-magic/py2/LICENSE b/contrib/python/python-magic/py2/LICENSE
deleted file mode 100644
index b8ca4b96ddb..00000000000
--- a/contrib/python/python-magic/py2/LICENSE
+++ /dev/null
@@ -1,58 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2001-2014 Adam Hupp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-====
-
-Portions of this package (magic/compat.py and test/libmagic_test.py)
-are distributed under the following copyright notice:
-
-
-$File: LEGAL.NOTICE,v 1.15 2006/05/03 18:48:33 christos Exp $
-Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
-Software written by Ian F. Darwin and others;
-maintained 1994- Christos Zoulas.
-
-This software is not subject to any export provision of the United States
-Department of Commerce, and may be exported to any country or planet.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice immediately at the beginning of the file, without modification,
-   this list of conditions, and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/contrib/python/python-magic/py2/README.md b/contrib/python/python-magic/py2/README.md
deleted file mode 100644
index 9eb70e8a30e..00000000000
--- a/contrib/python/python-magic/py2/README.md
+++ /dev/null
@@ -1,144 +0,0 @@
-# python-magic
-[![PyPI version](https://badge.fury.io/py/python-magic.svg)](https://badge.fury.io/py/python-magic)
-[![Build Status](https://travis-ci.org/ahupp/python-magic.svg?branch=master)](https://travis-ci.org/ahupp/python-magic) [![Join the chat at https://gitter.im/ahupp/python-magic](https://badges.gitter.im/ahupp/python-magic.svg)](https://gitter.im/ahupp/python-magic?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-python-magic is a Python interface to the libmagic file type
-identification library.  libmagic identifies file types by checking
-their headers according to a predefined list of file types. This
-functionality is exposed to the command line by the Unix command
-`file`.
-
-## Usage
-
-```python
->>> import magic
->>> magic.from_file("testdata/test.pdf")
-'PDF document, version 1.2'
-# recommend using at least the first 2048 bytes, as less can produce incorrect identification
->>> magic.from_buffer(open("testdata/test.pdf", "rb").read(2048))
-'PDF document, version 1.2'
->>> magic.from_file("testdata/test.pdf", mime=True)
-'application/pdf'
-```
-
-There is also a `Magic` class that provides more direct control,
-including overriding the magic database file and turning on character
-encoding detection.  This is not recommended for general use.  In
-particular, it's not safe for sharing across multiple threads and
-will fail throw if this is attempted.
-
-```python
->>> f = magic.Magic(uncompress=True)
->>> f.from_file('testdata/test.gz')
-'ASCII text (gzip compressed data, was "test", last modified: Sat Jun 28
-21:32:52 2008, from Unix)'
-```
-
-You can also combine the flag options:
-
-```python
->>> f = magic.Magic(mime=True, uncompress=True)
->>> f.from_file('testdata/test.gz')
-'text/plain'
-```
-
-## Installation
-
-The current stable version of python-magic is available on PyPI and
-can be installed by running `pip install python-magic`.
-
-Other sources:
-
-- PyPI: http://pypi.python.org/pypi/python-magic/
-- GitHub: https://github.com/ahupp/python-magic
-
-This module is a simple wrapper around the libmagic C library, and
-that must be installed as well:
-
-### Debian/Ubuntu
-
-```
-sudo apt-get install libmagic1
-```
-
-### Windows
-
-You'll need DLLs for libmagic.  @julian-r maintains a pypi package with the DLLs, you can fetch it with:
-
-```
-pip install python-magic-bin
-```
-
-### OSX
-
-- When using Homebrew: `brew install libmagic`
-- When using macports: `port install file`
-
-### Troubleshooting
-
-- 'MagicException: could not find any magic files!': some
-  installations of libmagic do not correctly point to their magic
-  database file.  Try specifying the path to the file explicitly in the
-  constructor: `magic.Magic(magic_file="path_to_magic_file")`.
-
-- 'WindowsError: [Error 193] %1 is not a valid Win32 application':
-  Attempting to run the 32-bit libmagic DLL in a 64-bit build of
-  python will fail with this error.  Here are 64-bit builds of libmagic for windows: https://github.com/pidydx/libmagicwin64.
-  Newer version can be found here: https://github.com/nscaife/file-windows.
-
-- 'WindowsError: exception: access violation writing 0x00000000 ' This may indicate you are mixing
-  Windows Python and Cygwin Python. Make sure your libmagic and python builds are consistent.
-
-
-## Bug Reports
-
-python-magic is a thin layer over the libmagic C library.
-Historically, most bugs that have been reported against python-magic
-are actually bugs in libmagic; libmagic bugs can be reported on their
-tracker here: https://bugs.astron.com/my_view_page.php.  If you're not
-sure where the bug lies feel free to file an issue on GitHub and I can
-triage it.
-
-## Running the tests
-
-To run the tests across a variety of linux distributions (depends on Docker):
-
-```
-./test_docker.sh
-```
-
-To run tests locally across all available python versions:
-
-```
-./test/run.py
-```
-
-To run against a specific python version:
-
-```
-LC_ALL=en_US.UTF-8 python3 test/test.py
-```
-
-## libmagic python API compatibility
-
-The python bindings shipped with libmagic use a module name that conflicts with this package.  To work around this, python-magic includes a compatibility layer for the libmagic API.  See [COMPAT.md](COMPAT.md) for a guide to libmagic / python-magic compatibility.
-
-## Versioning
-
-Minor version bumps should be backwards compatible.  Major bumps are not.
-
-## Author
-
-Written by Adam Hupp in 2001 for a project that never got off the
-ground.  It originally used SWIG for the C library bindings, but
-switched to ctypes once that was part of the python standard library.
-
-You can contact me via my [website](http://hupp.org/adam) or
-[GitHub](http://github.com/ahupp).
-
-## License
-
-python-magic is distributed under the MIT license.  See the included
-LICENSE file for details.
-
-I am providing code in the repository to you under an open source license. Because this is my personal repository, the license you receive to my code is from me and not my employer (Facebook).