From 8cedf04b0a65e93de380a592dc04cc28fe8689a7 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <maebert@uos.de>
Date: Wed, 8 May 2013 09:56:49 -0700
Subject: [PATCH] Backwards compatibility with parsedatetime 0.8.7

Closes #76
---
 CHANGELOG.md     | 10 +++++++---
 jrnl/Journal.py  |  3 ++-
 jrnl/__init__.py |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91fd3af6..a0a5e984 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,18 @@
 Changelog
 =========
 
-### 1.0.4
+#### 1.0.5
+
+* Backwards compatibility with `parsedatetime` 0.8.7
+
+#### 1.0.4
 
 * [Improved] Python 2.6 compatibility
 * [Improved] Better utf-8 support
 * [New] Python 3 compatibility
 * [New] Respects the `XDG_CONFIG_HOME` environment variable for storing your configuration file (Thanks [evaryont](https://github.com/evaryont))
 
-### 1.0.3 (April 17, 2013)
+#### 1.0.3 (April 17, 2013)
 
 * [Improved] Removed clint in favour of colorama
 * [Fixed] Fixed a bug where showing tags failed when no tags are defined.
@@ -16,7 +20,7 @@ Changelog
 * [Fixed] Fixes readline support on Windows
 * [Fixed] Smaller fixes and typos
 
-### 1.0.1 (March 12, 2013)
+#### 1.0.1 (March 12, 2013)
 
 * [Fixed] Requires parsedatetime 1.1.2 or newer
 
diff --git a/jrnl/Journal.py b/jrnl/Journal.py
index b259d662..1e8e905f 100644
--- a/jrnl/Journal.py
+++ b/jrnl/Journal.py
@@ -5,7 +5,8 @@ try: from . import Entry
 except (SystemError, ValueError): import Entry
 import codecs
 import os
-import parsedatetime.parsedatetime as pdt
+try: import parsedatetime.parsedatetime_consts as pdt
+except ImportError: import parsedatetime.parsedatetime as pdt
 import re
 from datetime import datetime
 import time
diff --git a/jrnl/__init__.py b/jrnl/__init__.py
index bc168105..8e629323 100644
--- a/jrnl/__init__.py
+++ b/jrnl/__init__.py
@@ -7,7 +7,7 @@ jrnl is a simple journal application for your command line.
 """
 
 __title__ = 'jrnl'
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 __author__ = 'Manuel Ebert'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2013 Manuel Ebert'