paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 02:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Tim Abbott
2013-01-10 16:49:07 -05:00
parent 3c8b30d043
commit 761b7cd5fa
6 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
zephyr/lib/time.py → zephyr/lib/timestamp.py
View File

2
zephyr/management/commands/dump_pointers.py
View File

@@ -1,7 +1,7 @@
from optparse import make_option from optparse import make_option
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from zephyr.models import Realm, UserProfile, Message, UserMessage 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 import simplejson
def dump(): def dump():

2
zephyr/management/commands/dump_useractivity.py
View File

@@ -2,7 +2,7 @@ from optparse import make_option
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from zephyr.models import Realm, UserProfile, UserActivity, get_client from zephyr.models import Realm, UserProfile, UserActivity, get_client
import simplejson 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(): def dump():
pointers = [] pointers = []

2
zephyr/management/commands/populate_db.py
View File

@@ -13,7 +13,7 @@ from django.conf import settings
from zephyr.lib.bulk_create import batch_bulk_create, bulk_create_realms, \ from zephyr.lib.bulk_create import batch_bulk_create, bulk_create_realms, \
bulk_create_streams, bulk_create_users, bulk_create_huddles, \ bulk_create_streams, bulk_create_users, bulk_create_huddles, \
bulk_create_clients 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 from zephyr.models import MAX_MESSAGE_LENGTH
import simplejson import simplejson

2
zephyr/models.py
View File

@@ -20,7 +20,7 @@ import subprocess
import traceback import traceback
import re import re
from django.utils.html import escape 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_SUBJECT_LENGTH = 60
MAX_MESSAGE_LENGTH = 10000 MAX_MESSAGE_LENGTH = 10000

2
zephyr/views.py
View File

@@ -30,7 +30,7 @@ from zephyr.decorator import require_post, \
from zephyr.lib.query import last_n from zephyr.lib.query import last_n
from zephyr.lib.avatar import gravatar_hash from zephyr.lib.avatar import gravatar_hash
from zephyr.lib.response import json_success, json_error 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 from confirmation.models import Confirmation