Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py	Thu Mar 09 17:56:06 2017 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py	Thu Mar 09 19:28:59 2017 +0100
@@ -108,11 +108,12 @@
         importRootNode = BookmarkNode(BookmarkNode.Folder)
         folders[self.__fileName] = importRootNode
         
-        for dir, subdirs, files in os.walk(self.__fileName):
+        for directory, subdirs, files in os.walk(self.__fileName):
             for subdir in subdirs:
-                path = os.path.join(dir, subdir)
-                if dir in folders:
-                    folder = BookmarkNode(BookmarkNode.Folder, folders[dir])
+                path = os.path.join(directory, subdir)
+                if directory in folders:
+                    folder = BookmarkNode(BookmarkNode.Folder,
+                                          folders[directory])
                 else:
                     folder = BookmarkNode(BookmarkNode.Folder, importRootNode)
                 folder.title = subdir.replace("&", "&&")
@@ -121,7 +122,7 @@
             for file in files:
                 name, ext = os.path.splitext(file)
                 if ext.lower() == ".url":
-                    path = os.path.join(dir, file)
+                    path = os.path.join(directory, file)
                     try:
                         f = open(path, "r")
                         contents = f.read()
@@ -134,9 +135,9 @@
                             url = line.replace("URL=", "")
                             break
                     if url:
-                        if dir in folders:
+                        if directory in folders:
                             bookmark = BookmarkNode(BookmarkNode.Bookmark,
-                                                    folders[dir])
+                                                    folders[directory])
                         else:
                             bookmark = BookmarkNode(BookmarkNode.Bookmark,
                                                     importRootNode)