Updated docs from master

jrnl/__init__.py

@@ -7,10 +7,10 @@ jrnl is a simple journal application for your command line.
 """
 
 __title__ = 'jrnl'
-__version__ = '1.7.4'
+__version__ = '1.7.5'
 __author__ = 'Manuel Ebert'
 __license__ = 'MIT License'
-__copyright__ = 'Copyright 2013 Manuel Ebert'
+__copyright__ = 'Copyright 2013 - 2014 Manuel Ebert'
 
 from . import Journal
 from . import cli

jrnl/util.py

@@ -8,6 +8,9 @@ import keyring
 import pytz
 try: import simplejson as json
 except ImportError: import json
+if "win32" in sys.platform:
+    import colorama
+    colorama.init()
 import re
 import tempfile
 import subprocess
@@ -126,11 +129,9 @@ def load_and_fix_json(json_path):
 
 def get_text_from_editor(config, template=""):
     tmpfile = os.path.join(tempfile.gettempdir(), "jrnl")
-    if template:
-        with codecs.open(tmpfile, 'w', "utf-8") as f:
+    with codecs.open(tmpfile, 'w', "utf-8") as f:
+        if template:
             f.write(template)
-    with open(tmpfile, 'w'):
-        pass
     subprocess.call(config['editor'].split() + [tmpfile])
     with codecs.open(tmpfile, "r", "utf-8") as f:
         raw = f.read()