From 55e5378659e6ed54e72d88f80043942944b38f3f Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" <stuart@gathman.org> Date: Sun, 23 Dec 2018 20:29:01 -0500 Subject: [PATCH] Move py3 sgmllib to an internal module - Scott Kitterman --- sgmllib.py => Milter/sgmllib.py | 0 mime.py | 5 ++++- setup.py | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) rename sgmllib.py => Milter/sgmllib.py (100%) diff --git a/sgmllib.py b/Milter/sgmllib.py similarity index 100% rename from sgmllib.py rename to Milter/sgmllib.py diff --git a/mime.py b/mime.py index b6a4a7e..76f8a88 100644 --- a/mime.py +++ b/mime.py @@ -401,7 +401,10 @@ class _defang: # emulate old defang function defang = _defang() -from sgmllib import SGMLParser as HTMLParser +if sys.version < '3.0.0': + from sgmllib import SGMLParser as HTMLParser +else: + from Milter.sgmllib import SGMLParser as HTMLParser import re declname = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9]*\s*') diff --git a/setup.py b/setup.py index aa8103f..722cb72 100644 --- a/setup.py +++ b/setup.py @@ -12,9 +12,6 @@ if sys.version < '2.6.5': 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.2', -- GitLab