Skip to content

Commit a28925b

Browse files
nmariznmariz
committed
Revert "Update copyright source headers in issues tests files"
This reverts commit 02b481a.
1 parent c74c148 commit a28925b

File tree

5 files changed

+85
-110
lines changed

5 files changed

+85
-110
lines changed

‎tests/issues/test_bug21449207.py

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

3025
import mysql.connector
3126
from tests import foreach_cnx, cnx_config

‎tests/issues/test_bug21449996.py

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

3025
import mysql.connector
3126
from tests import foreach_cnx
@@ -61,4 +56,4 @@ def test_load_data_compressed(self):
6156
self.fail(exc)
6257

6358
cur.execute("SELECT COUNT(*) FROM %s" % self.table_name)
64-
self.assertEqual(11486, cur.fetchone()[0])
59+
self.assertEqual(11486, cur.fetchone()[0])

‎tests/issues/test_bug21879859.py

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

3025
""" BUG21879859
3126
"""

‎tests/issues/test_bug21879914.py

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

3025
""" BUG21879914 Fix using C/Extension with only CA given
3126
"""

‎tests/issues/test_bug22545879.py

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

3025
""" BUG22545879 Fix reading and using ssl-cipher MySQL option
3126
"""

0 commit comments

Comments
 (0)