chore: remove more dead code (#8208)
* chore: remove unused settings * chore: remove unused ietf.utils.aliases / config
This commit is contained in:
Jennifer Richards
GitHub
parent
b4fd3bfbb7
commit
a70171dfd9
|
|
@ -744,8 +744,6 @@ IANA_SYNC_PASSWORD = "secret"
|
|||
IANA_SYNC_CHANGES_URL = "https://datatracker.iana.org:4443/data-tracker/changes"
|
||||
IANA_SYNC_PROTOCOLS_URL = "https://www.iana.org/protocols/"
|
||||
|
||||
RFC_TEXT_RSYNC_SOURCE="ftp.rfc-editor.org::rfcs-text-only"
|
||||
|
||||
RFC_EDITOR_SYNC_PASSWORD="secret"
|
||||
RFC_EDITOR_SYNC_NOTIFICATION_URL = "https://www.rfc-editor.org/parser/parser.php"
|
||||
RFC_EDITOR_GROUP_NOTIFICATION_EMAIL = "webmaster@rfc-editor.org"
|
||||
|
|
@ -972,7 +970,6 @@ OIDC_EXTRA_SCOPE_CLAIMS = 'ietf.ietfauth.utils.OidcExtraScopeClaims'
|
|||
# ==============================================================================
|
||||
|
||||
|
||||
RSYNC_BINARY = '/usr/bin/rsync'
|
||||
YANGLINT_BINARY = '/usr/bin/yanglint'
|
||||
DE_GFM_BINARY = '/usr/bin/de-gfm.ruby2.5'
|
||||
|
||||
|
|
@ -1014,7 +1011,6 @@ CHAT_URL_PATTERN = 'https://zulip.ietf.org/#narrow/stream/{chat_room_name}'
|
|||
# CHAT_ARCHIVE_URL_PATTERN = 'https://www.ietf.org/jabber/logs/{chat_room_name}?C=M;O=D'
|
||||
|
||||
PYFLAKES_DEFAULT_ARGS= ["ietf", ]
|
||||
VULTURE_DEFAULT_ARGS= ["ietf", ]
|
||||
|
||||
# Automatic Scheduling
|
||||
#
|
||||
|
|
@ -1062,8 +1058,6 @@ GROUP_ALIAS_DOMAIN = IETF_DOMAIN
|
|||
TEST_DATA_DIR = os.path.abspath(BASE_DIR + "/../test/data")
|
||||
|
||||
|
||||
POSTCONFIRM_PATH = "/a/postconfirm/wrapper"
|
||||
|
||||
USER_PREFERENCE_DEFAULTS = {
|
||||
"expires_soon" : "14",
|
||||
"new_enough" : "14",
|
||||
|
|
@ -1078,6 +1072,7 @@ EXCLUDED_PERSONAL_EMAIL_REGEX_PATTERNS = [
|
|||
"@ietf.org$",
|
||||
]
|
||||
|
||||
# Configuration for django-markup
|
||||
MARKUP_SETTINGS = {
|
||||
'restructuredtext': {
|
||||
'settings_overrides': {
|
||||
|
|
@ -1091,8 +1086,6 @@ MARKUP_SETTINGS = {
|
|||
}
|
||||
}
|
||||
|
||||
MAILMAN_LIB_DIR = '/usr/lib/mailman'
|
||||
|
||||
# This is the number of seconds required between subscribing to an ietf
|
||||
# mailing list and datatracker account creation being accepted
|
||||
LIST_ACCOUNT_DELAY = 60*60*25 # 25 hours
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
# Copyright The IETF Trust 2013-2020, All Rights Reserved
|
||||
# -*- coding: utf-8 -*-
|
||||
# -*- Python -*-
|
||||
#
|
||||
# $Id: aliasutil.py $
|
||||
#
|
||||
# Author: Markus Stenberg <mstenber@cisco.com>
|
||||
#
|
||||
|
||||
|
||||
"""
|
||||
|
||||
Mailing list alias dumping utilities
|
||||
|
||||
"""
|
||||
|
||||
|
||||
from django.conf import settings
|
||||
from ietf.utils.log import log
|
||||
|
||||
import debug # pyflakes:ignore
|
||||
|
||||
def rewrite_email_address(email):
|
||||
""" Prettify the email address (and if it's empty, skip it by
|
||||
returning None). """
|
||||
if not email:
|
||||
return
|
||||
email = email.strip()
|
||||
if not email:
|
||||
return
|
||||
if email[0]=='<' and email[-1] == '>':
|
||||
email = email[1:-1]
|
||||
# If it doesn't look like email, skip
|
||||
if '@' not in email and '?' not in email:
|
||||
return
|
||||
return email
|
||||
|
||||
def rewrite_address_list(l):
|
||||
""" This utility function makes sure there is exactly one instance
|
||||
of an address within the result list, and preserves order
|
||||
(although it may not be relevant to start with) """
|
||||
h = {}
|
||||
for address in l:
|
||||
#address = address.strip()
|
||||
if address in h: continue
|
||||
h[address] = True
|
||||
yield address
|
||||
|
||||
def dump_sublist(afile, vfile, alias, adomains, vdomain, emails):
|
||||
if not emails:
|
||||
return emails
|
||||
# Nones in the list should be skipped
|
||||
emails = [_f for _f in emails if _f]
|
||||
|
||||
# Make sure emails are sane and eliminate the Nones again for
|
||||
# non-sane ones
|
||||
emails = [rewrite_email_address(e) for e in emails]
|
||||
emails = [_f for _f in emails if _f]
|
||||
|
||||
# And we'll eliminate the duplicates too but preserve order
|
||||
emails = list(rewrite_address_list(emails))
|
||||
if not emails:
|
||||
return emails
|
||||
try:
|
||||
filtername = 'xfilter-%s' % (alias, ) # in aliases, --> | expandname
|
||||
expandname = 'expand-%s' % (alias, ) # in virtual, --> email list
|
||||
|
||||
for domain in adomains:
|
||||
aliasaddr = '%s@%s' % (alias, domain) # in virtual, --> filtername
|
||||
vfile.write('%-64s %s\n' % (aliasaddr, filtername))
|
||||
afile.write('%-64s "|%s filter %s %s"\n' % (filtername+':', settings.POSTCONFIRM_PATH, expandname, vdomain))
|
||||
vfile.write('%-64s %s\n' % ("%s@%s"%(expandname, vdomain), ', '.join(emails)))
|
||||
|
||||
except UnicodeEncodeError:
|
||||
# If there's unicode in email address, something is badly
|
||||
# wrong and we just silently punt
|
||||
# XXX - is there better approach?
|
||||
log('Error encoding email address for an %s alias: %s' % (alias, repr(emails)))
|
||||
return []
|
||||
return emails
|
||||
|
||||
Loading…
Reference in a new issue