Move all the web-related stuff to its own subdirectory. This stuff doesn't

really work yet anyway.  Eradicate UserDesc.

34 files changed, 0 insertions, 66 deletions

diff --git a/mailman/UserDesc.py b/mailman/UserDesc.py
deleted file mode 100644
index cb89176ee..000000000
--- a/mailman/UserDesc.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
-#
-# This file is part of GNU Mailman.
-#
-# GNU Mailman is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
-#
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
-
-"""User description class/structure, for ApprovedAddMember and friends."""
-
-
-
-class UserDesc:
-    def __init__(self, address=None, fullname=None, password=None,
-                 digest=None, lang=None):
-        if address is not None:
-            self.address = address
-        if fullname is not None:
-            self.fullname = fullname
-        if password is not None:
-            self.password = password
-        if digest is not None:
-            self.digest = digest
-        if lang is not None:
-            self.language = lang
-
-    def __iadd__(self, other):
-        if getattr(other, 'address', None) is not None:
-            self.address = other.address
-        if getattr(other, 'fullname', None) is not None:
-            self.fullname = other.fullname
-        if getattr(other, 'password', None) is not None:
-            self.password = other.password
-        if getattr(other, 'digest', None) is not None:
-            self.digest = other.digest
-        if getattr(other, 'language', None) is not None:
-            self.language = other.language
-        return self
-
-    def __repr__(self):
-        address = getattr(self, 'address', 'n/a')
-        fullname = getattr(self, 'fullname', 'n/a')
-        password = getattr(self, 'password', 'n/a')
-        digest = getattr(self, 'digest', 'n/a')
-        if digest == 0:
-            digest = 'no'
-        elif digest == 1:
-            digest = 'yes'
-        language = getattr(self, 'language', 'n/a')
-        # Make sure fullname and password are encoded if they're strings
-        if isinstance(fullname, unicode):
-            fullname = fullname.encode('ascii', 'replace')
-        if isinstance(password, unicode):
-            password = password.encode('ascii', 'replace')
-        return '<UserDesc %s (%s) [%s] [digest? %s] [%s]>' % (
-            address, fullname, password, digest, language)
diff --git a/mailman/tests/test_membership.py b/mailman/tests/test_membership.py
index 062520665..792681472 100644
--- a/mailman/tests/test_membership.py
+++ b/mailman/tests/test_membership.py
@@ -23,7 +23,6 @@ import unittest
 
 from mailman import Utils
 from mailman import passwords
-from mailman.UserDesc import UserDesc
 from mailman.configuration import config
 from mailman.core.errors import NotAMemberError
 
diff --git a/mailman/Cgi/Auth.py b/mailman/web/Cgi/Auth.py
index 996aa21c5..996aa21c5 100644
--- a/mailman/Cgi/Auth.py
+++ b/mailman/web/Cgi/Auth.py
diff --git a/mailman/Cgi/__init__.py b/mailman/web/Cgi/__init__.py
index e69de29bb..e69de29bb 100644
--- a/mailman/Cgi/__init__.py
+++ b/mailman/web/Cgi/__init__.py
diff --git a/mailman/Cgi/admin.py b/mailman/web/Cgi/admin.py
index ca90805a7..ca90805a7 100644
--- a/mailman/Cgi/admin.py
+++ b/mailman/web/Cgi/admin.py
diff --git a/mailman/Cgi/admindb.py b/mailman/web/Cgi/admindb.py
index 3934c7d42..3934c7d42 100644
--- a/mailman/Cgi/admindb.py
+++ b/mailman/web/Cgi/admindb.py
diff --git a/mailman/Cgi/confirm.py b/mailman/web/Cgi/confirm.py
index b9c87f788..b9c87f788 100644
--- a/mailman/Cgi/confirm.py
+++ b/mailman/web/Cgi/confirm.py
diff --git a/mailman/Cgi/create.py b/mailman/web/Cgi/create.py
index 3caf9fcc0..3caf9fcc0 100644
--- a/mailman/Cgi/create.py
+++ b/mailman/web/Cgi/create.py
diff --git a/mailman/Cgi/edithtml.py b/mailman/web/Cgi/edithtml.py
index e06fb7956..e06fb7956 100644
--- a/mailman/Cgi/edithtml.py
+++ b/mailman/web/Cgi/edithtml.py
diff --git a/mailman/Cgi/listinfo.py b/mailman/web/Cgi/listinfo.py
index 656801a90..656801a90 100644
--- a/mailman/Cgi/listinfo.py
+++ b/mailman/web/Cgi/listinfo.py
diff --git a/mailman/Cgi/options.py b/mailman/web/Cgi/options.py
index 3b9331fd1..3b9331fd1 100644
--- a/mailman/Cgi/options.py
+++ b/mailman/web/Cgi/options.py
diff --git a/mailman/Cgi/private.py b/mailman/web/Cgi/private.py
index 3199fb842..3199fb842 100644
--- a/mailman/Cgi/private.py
+++ b/mailman/web/Cgi/private.py
diff --git a/mailman/Cgi/rmlist.py b/mailman/web/Cgi/rmlist.py
index 21d54a4a4..21d54a4a4 100644
--- a/mailman/Cgi/rmlist.py
+++ b/mailman/web/Cgi/rmlist.py
diff --git a/mailman/Cgi/roster.py b/mailman/web/Cgi/roster.py
index 697786af1..697786af1 100644
--- a/mailman/Cgi/roster.py
+++ b/mailman/web/Cgi/roster.py
diff --git a/mailman/Cgi/subscribe.py b/mailman/web/Cgi/subscribe.py
index 78fae7230..78fae7230 100644
--- a/mailman/Cgi/subscribe.py
+++ b/mailman/web/Cgi/subscribe.py
diff --git a/mailman/Cgi/wsgi_app.py b/mailman/web/Cgi/wsgi_app.py
index 08a92fdf9..08a92fdf9 100644
--- a/mailman/Cgi/wsgi_app.py
+++ b/mailman/web/Cgi/wsgi_app.py
diff --git a/mailman/Gui/Archive.py b/mailman/web/Gui/Archive.py
index 5929f097b..5929f097b 100644
--- a/mailman/Gui/Archive.py
+++ b/mailman/web/Gui/Archive.py
diff --git a/mailman/Gui/Autoresponse.py b/mailman/web/Gui/Autoresponse.py
index 04cefa0d9..04cefa0d9 100644
--- a/mailman/Gui/Autoresponse.py
+++ b/mailman/web/Gui/Autoresponse.py
diff --git a/mailman/Gui/Bounce.py b/mailman/web/Gui/Bounce.py
index 0ea128205..0ea128205 100644
--- a/mailman/Gui/Bounce.py
+++ b/mailman/web/Gui/Bounce.py
diff --git a/mailman/Gui/ContentFilter.py b/mailman/web/Gui/ContentFilter.py
index d7f26321b..d7f26321b 100644
--- a/mailman/Gui/ContentFilter.py
+++ b/mailman/web/Gui/ContentFilter.py
diff --git a/mailman/Gui/Digest.py b/mailman/web/Gui/Digest.py
index 278fa808d..278fa808d 100644
--- a/mailman/Gui/Digest.py
+++ b/mailman/web/Gui/Digest.py
diff --git a/mailman/Gui/GUIBase.py b/mailman/web/Gui/GUIBase.py
index c521d940e..c521d940e 100644
--- a/mailman/Gui/GUIBase.py
+++ b/mailman/web/Gui/GUIBase.py
diff --git a/mailman/Gui/General.py b/mailman/web/Gui/General.py
index 1d0424de9..1d0424de9 100644
--- a/mailman/Gui/General.py
+++ b/mailman/web/Gui/General.py
diff --git a/mailman/Gui/Language.py b/mailman/web/Gui/Language.py
index 71065d93d..71065d93d 100644
--- a/mailman/Gui/Language.py
+++ b/mailman/web/Gui/Language.py
diff --git a/mailman/Gui/Membership.py b/mailman/web/Gui/Membership.py
index 6dd751807..6dd751807 100644
--- a/mailman/Gui/Membership.py
+++ b/mailman/web/Gui/Membership.py
diff --git a/mailman/Gui/NonDigest.py b/mailman/web/Gui/NonDigest.py
index 6ed0e4612..6ed0e4612 100644
--- a/mailman/Gui/NonDigest.py
+++ b/mailman/web/Gui/NonDigest.py
diff --git a/mailman/Gui/Passwords.py b/mailman/web/Gui/Passwords.py
index 234859bc1..234859bc1 100644
--- a/mailman/Gui/Passwords.py
+++ b/mailman/web/Gui/Passwords.py
diff --git a/mailman/Gui/Privacy.py b/mailman/web/Gui/Privacy.py
index ccc8a2e29..ccc8a2e29 100644
--- a/mailman/Gui/Privacy.py
+++ b/mailman/web/Gui/Privacy.py
diff --git a/mailman/Gui/Topics.py b/mailman/web/Gui/Topics.py
index 501c21329..501c21329 100644
--- a/mailman/Gui/Topics.py
+++ b/mailman/web/Gui/Topics.py
diff --git a/mailman/Gui/Usenet.py b/mailman/web/Gui/Usenet.py
index 713114e1b..713114e1b 100644
--- a/mailman/Gui/Usenet.py
+++ b/mailman/web/Gui/Usenet.py
diff --git a/mailman/Gui/__init__.py b/mailman/web/Gui/__init__.py
index f88274a6e..f88274a6e 100644
--- a/mailman/Gui/__init__.py
+++ b/mailman/web/Gui/__init__.py
diff --git a/mailman/HTMLFormatter.py b/mailman/web/HTMLFormatter.py
index 1802a36fc..1802a36fc 100644
--- a/mailman/HTMLFormatter.py
+++ b/mailman/web/HTMLFormatter.py
diff --git a/mailman/web/__init__.py b/mailman/web/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mailman/web/__init__.py
diff --git a/mailman/htmlformat.py b/mailman/web/htmlformat.py
index 3a95999e8..3a95999e8 100644
--- a/mailman/htmlformat.py
+++ b/mailman/web/htmlformat.py