From cf027a338872f67a48b2bf47c4592c644c113d60 Mon Sep 17 00:00:00 2001
From: Manuel Zabelt <43759631+TTMaZa@users.noreply.github.com>
Date: Mon, 26 Jul 2021 14:43:05 +0200
Subject: [PATCH 1/4] Fixed license inconsistency BSD vs. PSF-2.0

License file clearly states, "PSF-2.0" but https://pypi.org/project/astunparse/ lists "BSD"
---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index e5a277a..2bbe586 100755
--- a/setup.py
+++ b/setup.py
@@ -37,13 +37,13 @@ def read_version():
     package_dir={'': 'lib'},
     include_package_data=True,
     install_requires=read_reqs('requirements.txt'),
-    license="BSD",
+    license="PSF-2.0",
     zip_safe=False,
     keywords='astunparse',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
+        'License :: OSI Approved :: Python Software Foundation License',
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
         'Programming Language :: Python :: 2.7',

From ec50789c827088085224c3be5d3395b3bbe8bab5 Mon Sep 17 00:00:00 2001
From: Manuel Zabelt <43759631+TTMaZa@users.noreply.github.com>
Date: Tue, 27 Jul 2021 11:18:33 +0200
Subject: [PATCH 2/4] Dual-Licensing marked down in official SPDX-Syntax

https://spdx.dev/wp-content/uploads/sites/41/2017/12/spdxversion2.1.pdf
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2bbe586..75cca91 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ def read_version():
     package_dir={'': 'lib'},
     include_package_data=True,
     install_requires=read_reqs('requirements.txt'),
-    license="PSF-2.0",
+    license="(BSD-3-Clause OR PSF-2.0)",
     zip_safe=False,
     keywords='astunparse',
     classifiers=[

From ce96c0d97e34b3faca8f1377b2d30c7f6f528984 Mon Sep 17 00:00:00 2001
From: Manuel Zabelt <43759631+TTMaZa@users.noreply.github.com>
Date: Tue, 27 Jul 2021 11:20:03 +0200
Subject: [PATCH 3/4] Dual licenseing marked down as classifiers

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 75cca91..0ad2e36 100755
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,7 @@ def read_version():
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Python Software Foundation License',
+        'License :: OSI Approved :: BSD-3-Clause',
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
         'Programming Language :: Python :: 2.7',

From 30ccce9616715ad7641c0a7ba98f0d51c73e6567 Mon Sep 17 00:00:00 2001
From: Manuel Zabelt <43759631+TTMaZa@users.noreply.github.com>
Date: Tue, 27 Jul 2021 11:28:30 +0200
Subject: [PATCH 4/4] Conjunctive SPDX-Operator for (BSD-3-Clause AND PSF-2.0)

As README states, this librarie contains code that is distributed under PSF-2.0. The libraries itself is BSD-3-Clause.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0ad2e36..53388ee 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ def read_version():
     package_dir={'': 'lib'},
     include_package_data=True,
     install_requires=read_reqs('requirements.txt'),
-    license="(BSD-3-Clause OR PSF-2.0)",
+    license="(BSD-3-Clause AND PSF-2.0)",
     zip_safe=False,
     keywords='astunparse',
     classifiers=[