3 files changed, 23 insertions, 21 deletions

diff --git a/meta-python/classes/pypi-common.bbclass b/meta-python/classes/pypi-common.bbclass
new file mode 100644
index 000000000..365002ec0
--- /dev/null
+++ b/meta-python/classes/pypi-common.bbclass
@@ -0,0 +1,21 @@
+def pypi_package(d):
+    bpn = d.getVar('BPN', True)
+    if bpn.startswith('python-'):
+        return bpn[7:]
+    elif bpn.startswith('python3-'):
+        return bpn[8:]
+    return bpn
+
+PYPI_PACKAGE ?= "${@pypi_package(d)}"
+
+def pypi_src_uri(d):
+    package = d.getVar('PYPI_PACKAGE', True)
+    pv = d.getVar('PV', True)
+    return 'https://pypi.python.org/packages/source/%s/%s/%s-%s.tar.gz' % (package[0], package, package, pv)
+
+PYPI_SRC_URI ?= "${@pypi_src_uri(d)}"
+
+HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/"
+SECTION = "devel/python"
+SRC_URI += "${PYPI_SRC_URI}"
+S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}"
diff --git a/meta-python/classes/pypi.bbclass b/meta-python/classes/pypi.bbclass
index 41a70e25c..8d8350a2b 100644
--- a/meta-python/classes/pypi.bbclass
+++ b/meta-python/classes/pypi.bbclass
@@ -1,21 +1 @@
-def pypi_package(d):
-    bpn = d.getVar('BPN', True)
-    if bpn.startswith('python-'):
-        return bpn[7:]
-    return bpn
-
-PYPI_PACKAGE ?= "${@pypi_package(d)}"
-
-def pypi_src_uri(d):
-    package = d.getVar('PYPI_PACKAGE', True)
-    pv = d.getVar('PV', True)
-    return 'https://pypi.python.org/packages/source/%s/%s/%s-%s.tar.gz' % (package[0], package, package, pv)
-
-PYPI_SRC_URI ?= "${@pypi_src_uri(d)}"
-
-HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/"
-SECTION = "devel/python"
-SRC_URI += "${PYPI_SRC_URI}"
-S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}"
-
-inherit setuptools
+inherit pypi-common setuptools
diff --git a/meta-python/classes/pypi3.bbclass b/meta-python/classes/pypi3.bbclass
new file mode 100644
index 000000000..e0f7bb36e
--- /dev/null
+++ b/meta-python/classes/pypi3.bbclass
@@ -0,0 +1 @@
+inherit pypi-common setuptools3