Skip to content

Commit

Permalink
Update README, changelog and setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
j4321 committed Apr 18, 2018
2 parents c687528 + 02170d7 commit bff1b65
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
7 changes: 5 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Requirements
------------

- Linux
- Python 2.7 or 3.x with tkinter + ttk and python-psutil
- Python 2.7 or 3.x with tkinter + ttk, python-psutil and python-babel


Installation
Expand Down Expand Up @@ -115,9 +115,12 @@ Documentation
Changelog
---------

- tkfilebrowser 2.2.1
- tkfilebrowser 2.2.2
* Fix ValueError in after_cancel with Python 3.6.5

- tkfilebrowser 2.2.1
* Fix __main__.py for python 2

- tkfilebrowser 2.2.0
* Use babel instead of locale in order not to change the locale globally
* Speed up (a little) folder content display
Expand Down
5 changes: 4 additions & 1 deletion changelog
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ Copyright 2017 Juliette Monsel <j_4321@protonmail.com>
Changelog
---------

- tkfilebrowser 2.2.1
- tkfilebrowser 2.2.2
* Fix ValueError in after_cancel with Python 3.6.5

- tkfilebrowser 2.2.1
* Fix __main__.py for python 2

- tkfilebrowser 2.2.0
* Use babel instead of locale in order not to change the locale globally
* Speed up (a little) folder content display
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
long_description = f.read()

setup(name='tkfilebrowser',
version='2.2.1',
version='2.2.2',
description='File browser for Tkinter, alternative to tkinter.filedialog in linux with GTK bookmarks support.',
long_description=long_description,
url='https://github.com/j4321/tkFileBrowser',
Expand Down
10 changes: 8 additions & 2 deletions tkfilebrowser/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@
Example
"""

from tkfilebrowser.constants import tk, ttk
from tkfilebrowser import askopendirname, askopenfilenames, asksaveasfilename
from tkinter import filedialog
try:
import tkinter as tk
from tkinter import ttk
from tkinter import filedialog
except ImportError:
import Tkinter as tk
import ttk
import tkFileDialog as filedialog

root = tk.Tk()

Expand Down

0 comments on commit bff1b65

Please sign in to comment.