Merge branch 'fix-#16'

Author: j4321

README.rst

@@ -21,7 +21,7 @@ filebrowser and the following functions, similar to the one in filedialog:
     * ``askopendirnames`` that allow the selection of multiple folders
 
     * ``asksaveasfilename`` that returns a single filename and give a warning if the file already exists
-    
+
 
 The documentation is also available here: https://tkfilebrowser.readthedocs.io
 
@@ -32,7 +32,7 @@ Requirements
 ------------
 
 - Linux or Windows
-- Python 2.7 or 3.x 
+- Python 2.7 or 3.x
 
 And the python packages:
 
@@ -125,19 +125,22 @@ Documentation
     is asked to confirm its replacement.
 
     Additional option:
-    
+
         - defaultext: extension added to filename if none is given (default is none)
 
 
 Changelog
 ---------
 
+- tkfilebrowser 2.3.2
+    * Show networked drives on Windows
+
 - tkfilebrowser 2.3.1
     * Fix path bar navigation in Linux
-    
+
 - tkfilebrowser 2.3.0
     * Make package compatible with Windows
-    * Set initial focus on entry in save mode 
+    * Set initial focus on entry in save mode
 
 - tkfilebrowser 2.2.6
     * No longer reset path bar when clicking on a path button
@@ -146,9 +149,9 @@ Changelog
 - tkfilebrowser 2.2.5
     * Add compatibility with Tk < 8.6.0 (requires PIL.ImageTk)
     * Add desktop icon in shortcuts
-    * Fix handling of spaces in bookmarks 
+    * Fix handling of spaces in bookmarks
     * Fix bug due to spaces in recent file names
-    
+
 - tkfilebrowser 2.2.4
     * Fix bug in desktop folder identification
 

setup.py

@@ -14,7 +14,7 @@
 
 
 setup(name='tkfilebrowser',
-      version='2.3.1',
+      version='2.3.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',

tkfilebrowser/filebrowser.py

@@ -327,7 +327,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
         wrapper.add_tooltip("recent", _("Recently used"))
 
         # -------- devices
-        devices = psutil.disk_partitions()
+        devices = psutil.disk_partitions(all=True if OSNAME == "nt" else False)
 
         for d in devices:
             m = d.mountpoint
@@ -368,10 +368,10 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
             bm = []
             for folder in [shellcon.CSIDL_PERSONAL, shellcon.CSIDL_MYPICTURES,
                            shellcon.CSIDL_MYMUSIC, shellcon.CSIDL_MYVIDEO]:
-               try:
-                   bm.append([shell.SHGetFolderPath(0, folder, None, 0)])
-               except Exception:
-                   pass
+                try:
+                    bm.append([shell.SHGetFolderPath(0, folder, None, 0)])
+                except Exception:
+                    pass
         else:
             path_bm = join(home, ".config", "gtk-3.0", "bookmarks")
             path_bm2 = join(home, ".gtk-bookmarks")  # old location
@@ -890,7 +890,7 @@ def _completion(self, action, modif, pos, prev_txt):
         elif isabs(txt) or self.path_bar.winfo_ismapped():
             txt = txt[:int(pos)] + modif + txt[int(pos):]
             d, f = split(txt)
-            if f and not (f[0] is "." and self.hide):
+            if f and not (f[0] == "." and self.hide):
                 if not isabs(txt):
                     d2 = join(self.history[self._hist_index], d)
                 else:
@@ -900,7 +900,7 @@ def _completion(self, action, modif, pos, prev_txt):
                     root, dirs, files = walk(d2).send(None)
                     dirs.sort(key=lambda n: n.lower())
                     l2 = []
-                    if self.mode is not "opendir":
+                    if self.mode != "opendir":
                         files.sort(key=lambda n: n.lower())
                         extension = self.filetypes[self.filetype.get()]
                         if extension == r".*$":
@@ -1448,7 +1448,7 @@ def _validate_from_entry(self):
                 name = join(self.history[self._hist_index], name)
             if not exists(name):
                 self.entry.delete(0, "end")
-            elif self.mode is "openfile":
+            elif self.mode == "openfile":
                 if isfile(name):
                     if self.multiple_selection:
                         self.result = (realpath(name),)
@@ -1472,7 +1472,7 @@ def _validate_from_entry(self):
     def _validate_multiple_sel(self):
         """Validate selection in open mode with multiple selection."""
         sel = self.right_tree.selection()
-        if self.mode is "opendir":
+        if self.mode == "opendir":
             if sel:
                 self.result = tuple(realpath(s) for s in sel)
             else:
@@ -1499,7 +1499,7 @@ def _validate_multiple_sel(self):
     def _validate_single_sel(self):
         """Validate selection in open mode without multiple selection."""
         sel = self.right_tree.selection()
-        if self.mode is "openfile":
+        if self.mode == "openfile":
             if len(sel) == 1:
                 sel = sel[0]
                 tags = self.right_tree.item(sel, "tags")
@@ -1517,7 +1517,7 @@ def _validate_single_sel(self):
 
     def validate(self, event=None):
         """Validate selection and store it in self.results if valid."""
-        if self.mode is "save":
+        if self.mode == "save":
             self._validate_save()
         else:
             validation = self._validate_from_entry()