From 515d769f9f85bdf188e391abf7394d1543b1f381 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Tue, 5 Apr 2011 14:06:56 +0200
Subject: [PATCH] work around local django.utils package

---
 ox/django/utils.py | 1 +
 ox/utils.py        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ox/django/utils.py b/ox/django/utils.py
index 876ac94..261f979 100644
--- a/ox/django/utils.py
+++ b/ox/django/utils.py
@@ -1,6 +1,7 @@
 from django.http import HttpResponse,Http404
 from django.core.servers.basehttp import FileWrapper
 from django.conf import settings
+from django.utils.datetime_safe import datetime
 
 import mimetypes
 import os
diff --git a/ox/utils.py b/ox/utils.py
index fbafa02..27118a8 100644
--- a/ox/utils.py
+++ b/ox/utils.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
 try:
-    from django.utils.datetime_safe import datetime
+    from django.utils import datetime
 except ImportError:
     from datetime import datetime