Skip to content

Commit

Permalink
Fix import issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
fatlotus committed Jan 8, 2016
1 parent 7018f26 commit bcdc6c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions caravel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
CsrfProtect(app)

# Imported for side effects:
import caravel.model
import caravel.utils
import caravel.storage.config
import caravel.controllers.listings
import caravel.controllers.api
import caravel.controllers.moderation
Expand Down
4 changes: 2 additions & 2 deletions caravel/utils/emails.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import sendgrid
import logging

from caravel.utils import principals

SENDER = "Marketplace Team <marketplace@lists.uchicago.edu>"


Expand All @@ -15,6 +13,8 @@ def send_mail(to, subject, html, text, reply_to=None, sender=SENDER):
Sends an email to the given principals.
"""

from caravel.utils import principals

# Verify that we are not sending spam to people.
if not (isinstance(to, principals.Principal) and to.valid):
raise ValueError("{!r} does not consented to email.".format(to))
Expand Down

0 comments on commit bcdc6c1

Please sign in to comment.