Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DJANGO-LOGDB
Django-logdb enables you to log entries to a database, aggregate and act on
them with certain rules, and gives you more insight in what's going on.

Django-logdb requires Django 1.1 and higher.
Django-logdb requires Django 1.3 and higher.

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion djangologdb/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = (1, 1)
__version__ = (1, 2)
4 changes: 3 additions & 1 deletion djangologdb/utils.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import datetime
import json
import time

from django.db import models
from django.core.serializers.json import DjangoJSONEncoder
from django.utils import simplejson as json


def get_timestamp(date_time):
"""
Expand All @@ -13,6 +14,7 @@ def get_timestamp(date_time):
"""
return time.mktime(date_time.timetuple()) * 1000


def get_datetime(timestamp):
"""
Takes a `timestamp` and returns a `datetime` object.
Expand Down
5 changes: 3 additions & 2 deletions djangologdb/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import datetime
import json

from django.http import HttpResponseBadRequest, HttpResponse
from django.utils import simplejson

from djangologdb.utils import get_datetime
from djangologdb.models import LogEntry


def datasets(request):
"""
Returns a JSON encoded string containing the datasets. This view takes
Expand Down Expand Up @@ -56,4 +57,4 @@ def datasets(request):
except:
return HttpResponseBadRequest()

return HttpResponse(simplejson.dumps(result), mimetype='text/json')
return HttpResponse(json.dumps(result), mimetype='text/json')