From 834ef18c0973a515e941c8d9f5fa7d0a0b1cd954 Mon Sep 17 00:00:00 2001
From: "Stuart D. Gathman" <stuart@gathman.org>
Date: Thu, 29 Sep 2016 00:41:42 -0400
Subject: [PATCH] Really support python3
---
MANIFEST.in | 1 +
setup.cfg | 2 +-
setup.py | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index dca383e..c9c43e3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,6 +10,7 @@ include testmime.py
include testutils.py
include test.py
include sample.py
+include sgmllib.py
include milter-template.py
include test/*
include Milter/*.py
diff --git a/setup.cfg b/setup.cfg
index 66862d1..96821bb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[bdist_rpm]
-python=python2
+python=python3
doc_files=README NEWS TODO COPYING CREDITS
packager=Stuart D. Gathman <stuart@gathman.org>
release=1
diff --git a/setup.py b/setup.py
index 96e49ff..b8b72a2 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,10 @@ if sys.version < '2.6.5':
#libs = ["milter", "smutil"]
libs = ["milter"]
libdirs = ["/usr/lib/libmilter"] # needed for Debian
+modules = ["mime"]
+if sys.version >= '3':
+ modules.append("sgmllib")
+ print("modules=",modules)
# NOTE: importing Milter to obtain version fails when milter.so not built
setup(name = "pymilter", version = '1.0.1',
@@ -27,7 +31,7 @@ sending DSNs or doing CBVs.
maintainer_email="stuart@bmsi.com",
license="GPL",
url="http://www.bmsi.com/python/milter.html",
- py_modules=["mime"],
+ py_modules=modules,
packages = ['Milter'],
ext_modules=[
Extension("milter", ["miltermodule.c"],
--
GitLab