Merge pull request #127 from maebert/pdt1.2

Upgrade to parsedatetime 1.2

CHANGELOG.md

@@ -4,6 +4,7 @@ Changelog
 
 ### 1.7 (December 22, 2013)
 
+* __1.7.8__ Upgrade to parsedatetime 1.2
 * __1.7.7__ Cleaned up imports, better unicode support
 * __1.7.6__ Python 3 port for slugify
 * __1.7.5__ Colorama is only needed on windows. Smaller fixes

jrnl/Journal.py

@@ -7,7 +7,7 @@ from . import util
 import codecs
 import os
 try: import parsedatetime.parsedatetime_consts as pdt
-except ImportError: import parsedatetime.parsedatetime as pdt
+except ImportError: import parsedatetime as pdt
 import re
 from datetime import datetime
 import dateutil

jrnl/__init__.py

@@ -8,7 +8,7 @@ jrnl is a simple journal application for your command line.
 from __future__ import absolute_import
 
 __title__ = 'jrnl'
-__version__ = '1.7.7'
+__version__ = '1.7.8'
 __author__ = 'Manuel Ebert'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2013 - 2014 Manuel Ebert'

requirements.txt

@@ -1,4 +1,4 @@
-parsedatetime >= 1.1.2
+parsedatetime >= 1.2
 pytz >= 2013b
 pycrypto >= 2.6
 argparse==1.2.1

setup.py

@@ -70,7 +70,7 @@ setup(
     description = "A command line journal application that stores your journal in a plain text file",
     packages = ['jrnl'],
     install_requires = [
-        "parsedatetime>=1.1.2",
+        "parsedatetime>=1.2",
         "pytz>=2013b",
         "tzlocal==1.0",
         "keyring>=3.3",