heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed email variables from globals module

Browse Source
This commit is contained in:
Deb 2011-07-12 21:21:35 -04:00
parent 50dd725c58
commit 6ae8b541f9
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/app.py
View File

@ -93,12 +93,6 @@ class MediaGoblinApp(object):
####################################################### #######################################################
setup_globals( setup_globals(
# TODO: No need to set these two up as globals, we could
# just read them out of mg_globals.app_config
email_sender_address=app_config['email_sender_address'],
email_debug_mode=app_config['email_debug_mode'],
# Actual, useful to everyone objects
app=self, app=self,
db_connection=self.connection, db_connection=self.connection,
database=self.db, database=self.db,

2
mediagoblin/auth/lib.py
View File

@ -112,7 +112,7 @@ def send_verification_email(user, request):
# TODO: There is no error handling in place # TODO: There is no error handling in place
send_email( send_email(
mg_globals.email_sender_address, mg_globals.app_config['email_sender_address'],
[user['email']], [user['email']],
# TODO # TODO
# Due to the distributed nature of GNU MediaGoblin, we should # Due to the distributed nature of GNU MediaGoblin, we should

6
mediagoblin/mg_globals.py
View File

@ -20,12 +20,6 @@ database = None
public_store = None public_store = None
queue_store = None queue_store = None
# Dump mail to stdout instead of sending it:
email_debug_mode = False
# Address for sending out mails
email_sender_address = None
# A WorkBenchManager # A WorkBenchManager
workbench_manager = None workbench_manager = None

6
mediagoblin/util.py
View File

@ -265,9 +265,9 @@ def send_email(from_addr, to_addrs, subject, message_body):
- message_body: email body text - message_body: email body text
""" """
# TODO: make a mock mhost if testing is enabled # TODO: make a mock mhost if testing is enabled
if TESTS_ENABLED or mg_globals.email_debug_mode: if TESTS_ENABLED or mg_globals.app_config['email_debug_mode']:
mhost = FakeMhost() mhost = FakeMhost()
elif not mg_globals.email_debug_mode: elif not mg_globals.app_config['email_debug_mode']:
mhost = smtplib.SMTP() mhost = smtplib.SMTP()
mhost.connect() mhost.connect()
@ -280,7 +280,7 @@ def send_email(from_addr, to_addrs, subject, message_body):
if TESTS_ENABLED: if TESTS_ENABLED:
EMAIL_TEST_INBOX.append(message) EMAIL_TEST_INBOX.append(message)
if getattr(mg_globals, 'email_debug_mode', False): if mg_globals.app_config['email_debug_mode']:
print u"===== Email =====" print u"===== Email ====="
print u"From address: %s" % message['From'] print u"From address: %s" % message['From']
print u"To addresses: %s" % message['To'] print u"To addresses: %s" % message['To']