github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-02-10 22:54:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

emailer: Remove extraneous imports.

Browse Source
This commit is contained in:
Ricky Ramirez
2013-06-18 16:11:42 -07:00
parent 3b93eb3e27
commit a1b1bc81ad
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
r2/r2/lib/emailer.py
View File

@@ -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()