Rename zephyr.lib.time to zephyr.lib.timestamp.

Otherwise one gets:

AttributeError: 'module' object has no attribute 'time'

when trying to use the time module from inside zephyr.lib.

(imported from commit 645368672a3eff68320278dd480edeed56721fcc)

zephyr/management/commands/dump_pointers.py

@@ -1,7 +1,7 @@
 from optparse import make_option
 from django.core.management.base import BaseCommand
 from zephyr.models import Realm, UserProfile, Message, UserMessage
-from zephyr.lib.time import datetime_to_timestamp, timestamp_to_datetime
+from zephyr.lib.timestamp import datetime_to_timestamp, timestamp_to_datetime
 import simplejson
 
 def dump():

zephyr/management/commands/dump_useractivity.py

@@ -2,7 +2,7 @@ from optparse import make_option
 from django.core.management.base import BaseCommand
 from zephyr.models import Realm, UserProfile, UserActivity, get_client
 import simplejson
-from zephyr.lib.time import datetime_to_timestamp, timestamp_to_datetime
+from zephyr.lib.timestamp import datetime_to_timestamp, timestamp_to_datetime
 
 def dump():
     pointers = []

zephyr/management/commands/populate_db.py

@@ -13,7 +13,7 @@ from django.conf import settings
 from zephyr.lib.bulk_create import batch_bulk_create, bulk_create_realms, \
     bulk_create_streams, bulk_create_users, bulk_create_huddles, \
     bulk_create_clients
-from zephyr.lib.time import timestamp_to_datetime
+from zephyr.lib.timestamp import timestamp_to_datetime
 from zephyr.models import MAX_MESSAGE_LENGTH
 
 import simplejson

zephyr/models.py

@@ -20,7 +20,7 @@ import subprocess
 import traceback
 import re
 from django.utils.html import escape
-from zephyr.lib.time import datetime_to_timestamp
+from zephyr.lib.timestamp import datetime_to_timestamp
 
 MAX_SUBJECT_LENGTH = 60
 MAX_MESSAGE_LENGTH = 10000

zephyr/views.py

@@ -30,7 +30,7 @@ from zephyr.decorator import require_post, \
 from zephyr.lib.query import last_n
 from zephyr.lib.avatar import gravatar_hash
 from zephyr.lib.response import json_success, json_error
-from zephyr.lib.time import timestamp_to_datetime
+from zephyr.lib.timestamp import timestamp_to_datetime
 
 from confirmation.models import Confirmation