Skip to content

Commit bff1b65

Browse files
committed
Update README, changelog and setup.py
2 parents c687528 + 02170d7 commit bff1b65

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

README.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Requirements
2424
------------
2525

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

2929

3030
Installation
@@ -115,9 +115,12 @@ Documentation
115115
Changelog
116116
---------
117117

118-
- tkfilebrowser 2.2.1
118+
- tkfilebrowser 2.2.2
119119
* Fix ValueError in after_cancel with Python 3.6.5
120120

121+
- tkfilebrowser 2.2.1
122+
* Fix __main__.py for python 2
123+
121124
- tkfilebrowser 2.2.0
122125
* Use babel instead of locale in order not to change the locale globally
123126
* Speed up (a little) folder content display

changelog

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ Copyright 2017 Juliette Monsel <j_4321@protonmail.com>
66
Changelog
77
---------
88

9-
- tkfilebrowser 2.2.1
9+
- tkfilebrowser 2.2.2
1010
* Fix ValueError in after_cancel with Python 3.6.5
1111

12+
- tkfilebrowser 2.2.1
13+
* Fix __main__.py for python 2
14+
1215
- tkfilebrowser 2.2.0
1316
* Use babel instead of locale in order not to change the locale globally
1417
* Speed up (a little) folder content display

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
long_description = f.read()
1313

1414
setup(name='tkfilebrowser',
15-
version='2.2.1',
15+
version='2.2.2',
1616
description='File browser for Tkinter, alternative to tkinter.filedialog in linux with GTK bookmarks support.',
1717
long_description=long_description,
1818
url='https://github.com/j4321/tkFileBrowser',

tkfilebrowser/__main__.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@
2020
Example
2121
"""
2222

23-
from tkfilebrowser.constants import tk, ttk
2423
from tkfilebrowser import askopendirname, askopenfilenames, asksaveasfilename
25-
from tkinter import filedialog
24+
try:
25+
import tkinter as tk
26+
from tkinter import ttk
27+
from tkinter import filedialog
28+
except ImportError:
29+
import Tkinter as tk
30+
import ttk
31+
import tkFileDialog as filedialog
2632

2733
root = tk.Tk()
2834

0 commit comments

Comments
 (0)