diff options
Diffstat (limited to 'Mailman/Defaults.py')
| -rw-r--r-- | Mailman/Defaults.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/Mailman/Defaults.py b/Mailman/Defaults.py index 203fd878b..c4d9d7dbc 100644 --- a/Mailman/Defaults.py +++ b/Mailman/Defaults.py @@ -17,7 +17,6 @@ """Distributed default settings for significant Mailman config variables.""" -import os from datetime import timedelta from Mailman.interfaces import ReplyToMunging @@ -120,7 +119,7 @@ DEFAULT_VAR_DIRECTORY = '/var/mailman' # will store their data in this database, although external rosters may access # other databases in their own way. This string support substitutions using # any variable in the Configuration object. -SQLALCHEMY_ENGINE_URL = 'sqlite:///$DATA_DIR/mailman.db' +DEFAULT_DATABASE_URL = 'sqlite:///$DATA_DIR/mailman.db' # For debugging purposes SQLALCHEMY_ECHO = False @@ -455,7 +454,7 @@ NNTP_USERNAME = None NNTP_PASSWORD = None # Set this if you have an NNTP server you prefer gatewayed lists to use. -DEFAULT_NNTP_HOST = '' +DEFAULT_NNTP_HOST = u'' # These variables controls how headers must be cleansed in order to be # accepted by your NNTP server. Some servers like INN reject messages @@ -809,7 +808,7 @@ MAX_RESTARTS = 10 # The default language for this server. Whenever we can't figure out the list # context or user context, we'll fall back to using this language. This code # must be in the list of available language codes. -DEFAULT_SERVER_LANGUAGE = 'en' +DEFAULT_SERVER_LANGUAGE = u'en' # When allowing only members to post to a mailing list, how is the sender of # the message determined? If this variable is set to Yes, then first the @@ -909,10 +908,10 @@ DEFAULT_MAX_MESSAGE_SIZE = 40 # KB # These format strings will be expanded w.r.t. the dictionary for the # mailing list instance. -DEFAULT_SUBJECT_PREFIX = "[%(real_name)s] " +DEFAULT_SUBJECT_PREFIX = u'[%(real_name)s] ' # DEFAULT_SUBJECT_PREFIX = "[%(real_name)s %%d]" # for numbering -DEFAULT_MSG_HEADER = "" -DEFAULT_MSG_FOOTER = """\ +DEFAULT_MSG_HEADER = u'' +DEFAULT_MSG_FOOTER = u"""\ _______________________________________________ $real_name mailing list $fqdn_realname @@ -955,7 +954,7 @@ DEFAULT_GENERIC_NONMEMBER_ACTION = 1 DEFAULT_REQUIRE_EXPLICIT_DESTINATION = Yes # Alternate names acceptable as explicit destinations for this list. -DEFAULT_ACCEPTABLE_ALIASES =""" +DEFAULT_ACCEPTABLE_ALIASES = """ """ # For mailing lists that have only other mailing lists for members: DEFAULT_UMBRELLA_LIST = No @@ -978,7 +977,7 @@ DEFAULT_SEND_GOODBYE_MSG = Yes DEFAULT_ANONYMOUS_LIST = No # {header-name: regexp} spam filtering - we include some for example sake. -DEFAULT_BOUNCE_MATCHING_HEADERS = """ +DEFAULT_BOUNCE_MATCHING_HEADERS = u""" # Lines that *start* with a '#' are comments. to: friend@public.com message-id: relay.comanche.denmark.eu @@ -1098,7 +1097,7 @@ DEFAULT_NONDIGESTABLE = Yes # Will list be available in digested form? DEFAULT_DIGESTABLE = Yes -DEFAULT_DIGEST_HEADER = "" +DEFAULT_DIGEST_HEADER = u'' DEFAULT_DIGEST_FOOTER = DEFAULT_MSG_FOOTER DEFAULT_DIGEST_IS_DEFAULT = No @@ -1325,9 +1324,6 @@ AuthSiteAdmin = 5 # Site Administrator (total control over everything) -# Import a bunch of version numbers -from Version import * - # Vgg: Language descriptions and charsets dictionary, any new supported # language must have a corresponding entry here. Key is the name of the # directories that hold the localized texts. Data are tuples with first |