Skip to content

Commit fba053f

Browse files
nmariznmariz
committed
WL11473: Update license text
1 parent dc5862d commit fba053f

File tree

124 files changed

+3038
-2213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+3038
-2213
lines changed

‎LICENSE.txt

Lines changed: 316 additions & 91 deletions
Large diffs are not rendered by default.

‎README.txt

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,19 @@ They can be found in the examples/ directory.
2929
License
3030
=======
3131

32-
This is a release of MySQL Connector/Python, Oracle's dual-
33-
license Python Driver for MySQL. For the avoidance of
34-
doubt, this particular copy of the software is released
35-
under the version 2 of the GNU General Public License.
36-
MySQL Connector/Python is brought to you by Oracle.
37-
3832
Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
3933

34+
This is a release of MySQL Connector/Python, Oracle's Python driver for MySQL.
35+
4036
License information can be found in the LICENSE.txt file.
4137

42-
MySQL FOSS License Exception
43-
We want free and open source software applications under
44-
certain licenses to be able to use the GPL-licensed MySQL
45-
Connector/Python (specified GPL-licensed MySQL client libraries)
46-
despite the fact that not all such FOSS licenses are
47-
compatible with version 2 of the GNU General Public License.
48-
Therefore there are special exceptions to the terms and
49-
conditions of the GPLv2 as applied to these client libraries,
50-
which are identified and described in more detail in the
51-
FOSS License Exception at
52-
<http://www.mysql.com/about/legal/licensing/foss-exception.html>
53-
54-
This software is OSI Certified Open Source Software.
55-
OSI Certified is a certification mark of the Open Source Initiative.
56-
57-
This distribution may include materials developed by third
58-
parties. For license and attribution notices for these
59-
materials, please refer to the documentation that accompanies
60-
this distribution (see the "Licenses for Third-Party Components"
61-
appendix) or view the online documentation at
62-
<http://dev.mysql.com/doc/>
63-
A copy of the license/notices is also reproduced below.
64-
65-
GPLv2 Disclaimer
66-
For the avoidance of doubt, except that if any license choice
67-
other than GPL or LGPL is available it will apply instead,
68-
Oracle elects to use only the General Public License version 2
69-
(GPLv2) at this time for any software where a choice of GPL
70-
license versions is made available with the language indicating
71-
that GPLv2 or any later version may be used, or where a choice
72-
of which version of the GPL is applied is otherwise unspecified.
38+
This distribution may include materials developed by third parties.
39+
For license and attribution notices for these materials, please refer to the LICENSE.txt file.
40+
41+
For more information on MySQL Connector/Python, visit
42+
https://dev.mysql.com/doc/dev/connector-python/
43+
44+
For additional downloads and the source of MySQL Connector/Python, visit
45+
http://dev.mysql.com/downloads
7346

47+
MySQL Connector/Python is brought to you by the MySQL team at Oracle.

‎cpyint

‎examples/dates.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# MySQL Connector/Python - MySQL driver written in Python.
5-
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
6-
7-
# MySQL Connector/Python is licensed under the terms of the GPLv2
8-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
9-
# MySQL Connectors. There are special exceptions to the terms and
10-
# conditions of the GPLv2 as it is applied to this software, see the
11-
# FOSS License Exception
12-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
4+
# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
135
#
146
# This program is free software; you can redistribute it and/or modify
15-
# it under the terms of the GNU General Public License as published by
16-
# the Free Software Foundation.
7+
# it under the terms of the GNU General Public License, version 2.0, as
8+
# published by the Free Software Foundation.
179
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
10+
# This program is also distributed with certain software (including
11+
# but not limited to OpenSSL) that is licensed under separate terms,
12+
# as designated in a particular file or component or in included license
13+
# documentation. The authors of MySQL hereby grant you an
14+
# additional permission to link the program and your derivative works
15+
# with the separately licensed software that they have included with
16+
# MySQL.
17+
#
18+
# Without limiting anything contained in the foregoing, this file,
19+
# which is part of MySQL Connector/Python, is also subject to the
20+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
# http://oss.oracle.com/licenses/universal-foss-exception.
22+
#
23+
# This program is distributed in the hope that it will be useful, but
24+
# WITHOUT ANY WARRANTY; without even the implied warranty of
25+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
# See the GNU General Public License, version 2.0, for more details.
2227
#
2328
# You should have received a copy of the GNU General Public License
24-
# along with this program; if not, write to the Free Software
25-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29+
# along with this program; if not, write to the Free Software Foundation, Inc.,
30+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2631

2732
"""
2833

‎examples/engines.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# MySQL Connector/Python - MySQL driver written in Python.
5-
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
6-
7-
# MySQL Connector/Python is licensed under the terms of the GPLv2
8-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
9-
# MySQL Connectors. There are special exceptions to the terms and
10-
# conditions of the GPLv2 as it is applied to this software, see the
11-
# FOSS License Exception
12-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
4+
# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
135
#
146
# This program is free software; you can redistribute it and/or modify
15-
# it under the terms of the GNU General Public License as published by
16-
# the Free Software Foundation.
7+
# it under the terms of the GNU General Public License, version 2.0, as
8+
# published by the Free Software Foundation.
9+
#
10+
# This program is also distributed with certain software (including
11+
# but not limited to OpenSSL) that is licensed under separate terms,
12+
# as designated in a particular file or component or in included license
13+
# documentation. The authors of MySQL hereby grant you an
14+
# additional permission to link the program and your derivative works
15+
# with the separately licensed software that they have included with
16+
# MySQL.
17+
#
18+
# Without limiting anything contained in the foregoing, this file,
19+
# which is part of MySQL Connector/Python, is also subject to the
20+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
# http://oss.oracle.com/licenses/universal-foss-exception.
1722
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
23+
# This program is distributed in the hope that it will be useful, but
24+
# WITHOUT ANY WARRANTY; without even the implied warranty of
25+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
# See the GNU General Public License, version 2.0, for more details.
2227
#
2328
# You should have received a copy of the GNU General Public License
24-
# along with this program; if not, write to the Free Software
25-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29+
# along with this program; if not, write to the Free Software Foundation, Inc.,
30+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2631

2732
"""
2833

‎examples/inserts.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# MySQL Connector/Python - MySQL driver written in Python.
5-
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
6-
7-
# MySQL Connector/Python is licensed under the terms of the GPLv2
8-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
9-
# MySQL Connectors. There are special exceptions to the terms and
10-
# conditions of the GPLv2 as it is applied to this software, see the
11-
# FOSS License Exception
12-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
4+
# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
135
#
146
# This program is free software; you can redistribute it and/or modify
15-
# it under the terms of the GNU General Public License as published by
16-
# the Free Software Foundation.
7+
# it under the terms of the GNU General Public License, version 2.0, as
8+
# published by the Free Software Foundation.
179
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
10+
# This program is also distributed with certain software (including
11+
# but not limited to OpenSSL) that is licensed under separate terms,
12+
# as designated in a particular file or component or in included license
13+
# documentation. The authors of MySQL hereby grant you an
14+
# additional permission to link the program and your derivative works
15+
# with the separately licensed software that they have included with
16+
# MySQL.
17+
#
18+
# Without limiting anything contained in the foregoing, this file,
19+
# which is part of MySQL Connector/Python, is also subject to the
20+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
# http://oss.oracle.com/licenses/universal-foss-exception.
22+
#
23+
# This program is distributed in the hope that it will be useful, but
24+
# WITHOUT ANY WARRANTY; without even the implied warranty of
25+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
# See the GNU General Public License, version 2.0, for more details.
2227
#
2328
# You should have received a copy of the GNU General Public License
24-
# along with this program; if not, write to the Free Software
25-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29+
# along with this program; if not, write to the Free Software Foundation, Inc.,
30+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2631

2732
"""
2833
Example using MySQL Connector/Python showing:

‎examples/microseconds.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# MySQL Connector/Python - MySQL driver written in Python.
5-
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
6-
7-
# MySQL Connector/Python is licensed under the terms of the GPLv2
8-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
9-
# MySQL Connectors. There are special exceptions to the terms and
10-
# conditions of the GPLv2 as it is applied to this software, see the
11-
# FOSS License Exception
12-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
4+
# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
135
#
146
# This program is free software; you can redistribute it and/or modify
15-
# it under the terms of the GNU General Public License as published by
16-
# the Free Software Foundation.
7+
# it under the terms of the GNU General Public License, version 2.0, as
8+
# published by the Free Software Foundation.
9+
#
10+
# This program is also distributed with certain software (including
11+
# but not limited to OpenSSL) that is licensed under separate terms,
12+
# as designated in a particular file or component or in included license
13+
# documentation. The authors of MySQL hereby grant you an
14+
# additional permission to link the program and your derivative works
15+
# with the separately licensed software that they have included with
16+
# MySQL.
17+
#
18+
# Without limiting anything contained in the foregoing, this file,
19+
# which is part of MySQL Connector/Python, is also subject to the
20+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
# http://oss.oracle.com/licenses/universal-foss-exception.
1722
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
23+
# This program is distributed in the hope that it will be useful, but
24+
# WITHOUT ANY WARRANTY; without even the implied warranty of
25+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
# See the GNU General Public License, version 2.0, for more details.
2227
#
2328
# You should have received a copy of the GNU General Public License
24-
# along with this program; if not, write to the Free Software
25-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29+
# along with this program; if not, write to the Free Software Foundation, Inc.,
30+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2631

2732
"""
2833
Example using MySQL Connector/Python showing:

‎examples/multi_resultsets.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# MySQL Connector/Python - MySQL driver written in Python.
5-
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
6-
7-
# MySQL Connector/Python is licensed under the terms of the GPLv2
8-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
9-
# MySQL Connectors. There are special exceptions to the terms and
10-
# conditions of the GPLv2 as it is applied to this software, see the
11-
# FOSS License Exception
12-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
4+
# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
135
#
146
# This program is free software; you can redistribute it and/or modify
15-
# it under the terms of the GNU General Public License as published by
16-
# the Free Software Foundation.
7+
# it under the terms of the GNU General Public License, version 2.0, as
8+
# published by the Free Software Foundation.
179
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
10+
# This program is also distributed with certain software (including
11+
# but not limited to OpenSSL) that is licensed under separate terms,
12+
# as designated in a particular file or component or in included license
13+
# documentation. The authors of MySQL hereby grant you an
14+
# additional permission to link the program and your derivative works
15+
# with the separately licensed software that they have included with
16+
# MySQL.
17+
#
18+
# Without limiting anything contained in the foregoing, this file,
19+
# which is part of MySQL Connector/Python, is also subject to the
20+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
# http://oss.oracle.com/licenses/universal-foss-exception.
22+
#
23+
# This program is distributed in the hope that it will be useful, but
24+
# WITHOUT ANY WARRANTY; without even the implied warranty of
25+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
# See the GNU General Public License, version 2.0, for more details.
2227
#
2328
# You should have received a copy of the GNU General Public License
24-
# along with this program; if not, write to the Free Software
25-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29+
# along with this program; if not, write to the Free Software Foundation, Inc.,
30+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2631

2732
"""
2833

‎examples/mysql_warnings.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# MySQL Connector/Python - MySQL driver written in Python.
5-
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
6-
7-
# MySQL Connector/Python is licensed under the terms of the GPLv2
8-
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
9-
# MySQL Connectors. There are special exceptions to the terms and
10-
# conditions of the GPLv2 as it is applied to this software, see the
11-
# FOSS License Exception
12-
# <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
4+
# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
135
#
146
# This program is free software; you can redistribute it and/or modify
15-
# it under the terms of the GNU General Public License as published by
16-
# the Free Software Foundation.
7+
# it under the terms of the GNU General Public License, version 2.0, as
8+
# published by the Free Software Foundation.
9+
#
10+
# This program is also distributed with certain software (including
11+
# but not limited to OpenSSL) that is licensed under separate terms,
12+
# as designated in a particular file or component or in included license
13+
# documentation. The authors of MySQL hereby grant you an
14+
# additional permission to link the program and your derivative works
15+
# with the separately licensed software that they have included with
16+
# MySQL.
17+
#
18+
# Without limiting anything contained in the foregoing, this file,
19+
# which is part of MySQL Connector/Python, is also subject to the
20+
# Universal FOSS Exception, version 1.0, a copy of which can be found at
21+
# http://oss.oracle.com/licenses/universal-foss-exception.
1722
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
23+
# This program is distributed in the hope that it will be useful, but
24+
# WITHOUT ANY WARRANTY; without even the implied warranty of
25+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
26+
# See the GNU General Public License, version 2.0, for more details.
2227
#
2328
# You should have received a copy of the GNU General Public License
24-
# along with this program; if not, write to the Free Software
25-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29+
# along with this program; if not, write to the Free Software Foundation, Inc.,
30+
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2631

2732
"""
2833

0 commit comments

Comments
 (0)