fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes readline support on windows

Browse source 
Closes #60
This commit is contained in:
Manuel Ebert 2013-04-17 10:50:03 +02:00
parent 36fe783e5e
commit 9b0bee0637
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -6,6 +6,8 @@ Changelog
* [Improved] Installs pycrypto by default * [Improved] Installs pycrypto by default
* [Improved] Removed clint in favour of colorama * [Improved] Removed clint in favour of colorama
* [Fixed] Fixed a bug where showing tags failed when no tags are defined. * [Fixed] Fixed a bug where showing tags failed when no tags are defined.
* [Fixed] Improvements to config parsing (Thanks [alapolloni](https://github.com/alapolloni))
* [Fixed] Fixes readline support on Windows
* [Fixed] Smaller fixes and typos * [Fixed] Smaller fixes and typos
### 1.0.1 (March 12, 2013) ### 1.0.1 (March 12, 2013)

4
jrnl/Journal.py
View file

@ -16,6 +16,10 @@ try:
from Crypto.Random import random, atfork from Crypto.Random import random, atfork
except ImportError: except ImportError:
pass pass
try:
import pyreadline as readline
except ImportError:
import readline
import hashlib import hashlib
import getpass import getpass
try: try:

8
setup.py
View file

@ -43,15 +43,15 @@ except ImportError:
from distutils.core import setup from distutils.core import setup
import os import os
import sys import sys
import re
if sys.argv[-1] == 'publish': if sys.argv[-1] == 'publish':
os.system("python setup.py bdist-egg upload")
os.system("python setup.py sdist upload") os.system("python setup.py sdist upload")
sys.exit() sys.exit()
base_dir = os.path.dirname(os.path.abspath(__file__)) base_dir = os.path.dirname(os.path.abspath(__file__))
def get_version(filename="kerouac/__init__.py"): def get_version(filename="jrnl/__init__.py"):
with open(os.path.join(base_dir, filename)) as initfile: with open(os.path.join(base_dir, filename)) as initfile:
for line in initfile.readlines(): for line in initfile.readlines():
m = re.match("__version__ *= *['\"](.*)['\"]", line) m = re.match("__version__ *= *['\"](.*)['\"]", line)
@ -67,7 +67,7 @@ setup(
"parsedatetime >= 1.1.2", "parsedatetime >= 1.1.2",
"colorama >= 0.2.5", "colorama >= 0.2.5",
"pycrypto >= 2.6" "pycrypto >= 2.6"
], ] + ["pyreadline >= 2.0"] if "win" in sys.platform else [],
long_description=__doc__, long_description=__doc__,
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
@ -88,7 +88,7 @@ setup(
], ],
# metadata for upload to PyPI # metadata for upload to PyPI
author = "Manuel Ebert", author = "Manuel Ebert",
author_email = "manuel@herelabs.com", author_email = "manuel@hey.com",
license = "MIT License", license = "MIT License",
keywords = "journal todo todo.txt jrnl".split(), keywords = "journal todo todo.txt jrnl".split(),
url = "http://maebert.github.com/jrnl", url = "http://maebert.github.com/jrnl",