From f78f27982bb2f83881c2a87f42b683eabac64303 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 16 Aug 2012 11:06:04 -0500
Subject: [PATCH] fixed prettydate, thanks Anthony

---
 VERSION        | 2 +-
 gluon/tools.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 5092a743..776fda80 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-16 10:54:35) dev
+Version 2.00.0 (2012-08-16 11:06:01) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 161447d8..a139d1b7 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -4251,10 +4251,14 @@ def completion(callback):
     return _completion
 
 def prettydate(d,T=lambda x:x):
-    try:
+    if isinstance(d,datetime.datetime):
         dt = datetime.datetime.now() - d
-    except:
+    elif isinstance(d,datetime.date):
+        dt = datetime.date.today() - d
+    elif not d:
         return ''
+    else:
+        return '[invalid date]'
     if dt.days >= 2*365:
         return T('%d years ago') % int(dt.days / 365)
     elif dt.days >= 365: