From a1b1bc81ad80dd8ab0ace5f6bf56ea0b0f13f5c3 Mon Sep 17 00:00:00 2001 From: Ricky Ramirez Date: Tue, 18 Jun 2013 16:11:42 -0700 Subject: [PATCH] emailer: Remove extraneous imports. --- r2/r2/lib/emailer.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/r2/r2/lib/emailer.py b/r2/r2/lib/emailer.py index b2948fdc9..7bda3d28e 100644 --- a/r2/r2/lib/emailer.py +++ b/r2/r2/lib/emailer.py @@ -21,12 +21,13 @@ ############################################################################### from email.MIMEText import MIMEText -from pylons.i18n import _ -from pylons import c, g -from r2.lib.utils import timeago, query_string, randstr -from r2.models import passhash, Email, DefaultSR, has_opted_out, Account, Award -import os, random, datetime +import datetime import traceback, sys, smtplib + +from pylons import c, g + +from r2.lib.utils import timeago +from r2.models import Email, DefaultSR, Account, Award from r2.models.token import EmailVerificationToken, PasswordResetToken @@ -135,7 +136,7 @@ def send_queued_mail(test = False): """sends mail from the mail queue to smtplib for delivery. Also, on successes, empties the mail queue and adds all emails to the sent_mail list.""" - from r2.lib.pages import PasswordReset, Share, Mail_Opt, VerifyEmail + from r2.lib.pages import Share, Mail_Opt now = datetime.datetime.now(g.tz) if not c.site: c.site = DefaultSR()