Rename the email util to not conflict with a builtin library.

endpoints/api/user.py

@@ -18,8 +18,7 @@ from auth.permissions import (AdministerOrganizationPermission, CreateRepository
 from auth.auth_context import get_authenticated_user
 from auth import scopes
 from util.gravatar import compute_hash
-from util.email import (send_confirmation_email, send_recovery_email,
+from util.useremails import (send_confirmation_email, send_recovery_email, send_change_email)
-                        send_change_email)
 
 import features
 

endpoints/index.py

@@ -12,7 +12,7 @@ from app import analytics, app, webhook_queue, authentication
 from auth.auth import process_auth
 from auth.auth_context import get_authenticated_user, get_validated_token, get_validated_oauth_token
 from util.names import parse_repository_name
-from util.email import send_confirmation_email
+from util.useremails import send_confirmation_email
 from auth.permissions import (ModifyRepositoryPermission, UserAdminPermission,
                               ReadRepositoryPermission, CreateRepositoryPermission)
 

endpoints/webhooks.py

@@ -8,7 +8,7 @@ from data import model
 from auth.auth import process_auth
 from auth.permissions import ModifyRepositoryPermission
 from util.invoice import renderInvoiceToHtml
-from util.email import send_invoice_email, send_subscription_change, send_payment_failed
+from util.useremails import send_invoice_email, send_subscription_change, send_payment_failed
 from util.names import parse_repository_name
 from util.http import abort
 from endpoints.trigger import BuildTrigger, ValidationRequestException, SkipRequestException

tools/emailinvoice.py

@@ -2,7 +2,7 @@ from app import stripe
 from app import app
 
 from util.invoice import renderInvoiceToHtml
-from util.email import send_invoice_email
+from util.useremails import send_invoice_email
 
 from data import model
 

tools/sendconfirmemail.py

@@ -1,7 +1,7 @@
 from app import stripe
 from app import app
 
-from util.email import send_confirmation_email
+from util.useremails import send_confirmation_email
 
 from data import model