From 18f9a342b3d66b879a52aa37ca0ac91d9175ce8a Mon Sep 17 00:00:00 2001 From: James Lu Date: Sat, 19 Oct 2019 09:57:13 -0700 Subject: [PATCH] Throw out mungeEmail for supybot.Author This has limited value these days, because 1) the email info for authors is most often in a public VCS already 2) it makes using the actual contact info harder. --- plugins/Plugin/plugin.py | 5 ++--- src/__init__.py | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/Plugin/plugin.py b/plugins/Plugin/plugin.py index 31bb851a1..9c71cd284 100644 --- a/plugins/Plugin/plugin.py +++ b/plugins/Plugin/plugin.py @@ -181,8 +181,7 @@ class Plugin(callbacks.Plugin): hasContribs = False if hasattr(module, '__author__'): if module.__author__ != supybot.authors.unknown: - author = _('was written by %s') % \ - utils.web.mungeEmail(str(module.__author__)) + author = _('was written by %s') % str(module.__author__) hasAuthor = True if hasattr(module, '__contributors__'): contribs = sortAuthors() @@ -218,7 +217,7 @@ class Plugin(callbacks.Plugin): if not authorInfo: return _('The nick specified (%s) is not a registered ' 'contributor.') % nick - fullName = utils.web.mungeEmail(str(authorInfo)) + fullName = str(authorInfo) contributions = [] if hasattr(module, '__contributors__'): if authorInfo not in module.__contributors__: diff --git a/src/__init__.py b/src/__init__.py index 96693d13a..c8b1831ae 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -47,8 +47,7 @@ class Author(object): self.email = email def __str__(self): - return '%s (%s) <%s>' % (self.name, self.nick, - utils.web.mungeEmail(self.email)) + return '%s (%s) <%s>' % (self.name, self.nick, self.email) class authors(object): # This is basically a bag. jemfinch = Author('Jeremy Fincher', 'jemfinch', 'jemfinch@users.sf.net')