From 0683f2657eb7eacff844f060cc7ee479c9650604 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake@devtable.com>
Date: Wed, 28 May 2014 18:22:48 -0400
Subject: [PATCH] Rename the email util to not conflict with a builtin library.

---
 endpoints/api/user.py            | 3 +--
 endpoints/index.py               | 2 +-
 endpoints/webhooks.py            | 2 +-
 tools/emailinvoice.py            | 2 +-
 tools/sendconfirmemail.py        | 2 +-
 util/{email.py => useremails.py} | 0
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename util/{email.py => useremails.py} (100%)

diff --git a/endpoints/api/user.py b/endpoints/api/user.py
index 4d54b3e50..2b663de60 100644
--- a/endpoints/api/user.py
+++ b/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,
-                        send_change_email)
+from util.useremails import (send_confirmation_email, send_recovery_email, send_change_email)
 
 import features
 
diff --git a/endpoints/index.py b/endpoints/index.py
index bc843d4d1..2d134fbc2 100644
--- a/endpoints/index.py
+++ b/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)
 
diff --git a/endpoints/webhooks.py b/endpoints/webhooks.py
index b31ad343d..0d9fcd227 100644
--- a/endpoints/webhooks.py
+++ b/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
diff --git a/tools/emailinvoice.py b/tools/emailinvoice.py
index f64777d41..63a5bd712 100644
--- a/tools/emailinvoice.py
+++ b/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
 
diff --git a/tools/sendconfirmemail.py b/tools/sendconfirmemail.py
index 3f7a02d95..e9333a181 100644
--- a/tools/sendconfirmemail.py
+++ b/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
 
diff --git a/util/email.py b/util/useremails.py
similarity index 100%
rename from util/email.py
rename to util/useremails.py