From 3baac7ddf34e5cbe463b58068beacffdf21e549f Mon Sep 17 00:00:00 2001
From: Steve Howell <showell@zulipchat.com>
Date: Fri, 12 Oct 2018 19:49:01 +0000
Subject: [PATCH] hipchat import: Handle missing emails for guest users.

---
 zerver/data_import/hipchat.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/zerver/data_import/hipchat.py b/zerver/data_import/hipchat.py
index 32f4d8d38e..f167fcd2ed 100755
--- a/zerver/data_import/hipchat.py
+++ b/zerver/data_import/hipchat.py
@@ -95,6 +95,13 @@ def convert_user_data(raw_data: List[ZerverFieldsT], realm_id: int) -> List[Zerv
         short_name = in_dict['mention_name']
         timezone = in_dict['timezone']
 
+        if not email:
+            # Hipchat guest users don't have emails, so
+            # we just fake them.
+            assert(is_guest)
+            email = 'guest-{id}@example.com'.format(id=id)
+            delivery_email = email
+
         date_joined = int(timezone_now().timestamp())
         is_active = not in_dict['is_deleted']