Skip to content

Fix an issue where modifying a snapshot or unknown circumstances caused node.children to be None #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mejituu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix an issue where modifying a snapshot or unknown circumstances caused node.children to be None #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0351c6
Remove the outdated U mode for open file
Mejituu Nov 15, 2023
0e09687
Fix an issue where modifying a snapshot or unknown circumstances caus…
Mejituu Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions snappergui/changesWindow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,16 @@ def add_path_to_tree(self, path, status, tree):
node = tree
# Add directories to tree
for file_name in parts[1:-1]:
if not file_name in node.children:
node.children[file_name] = changesWindow.TreeNode("", {}, 0, True)
node = node.children[file_name]
if node.children is not None:
if not file_name in node.children:
node.children[file_name] = changesWindow.TreeNode("", {}, 0, True)
node = node.children[file_name]
# Add last part of path to tree
if is_dir:
node.children[parts[-1]] = changesWindow.TreeNode("", {}, status, True)
else:
node.children[parts[-1]] = changesWindow.TreeNode(path, None, status, False)
if node.children is not None:
if is_dir:
node.children[parts[-1]] = changesWindow.TreeNode("", {}, status, True)
else:
node.children[parts[-1]] = changesWindow.TreeNode(path, None, status, False)

def print_tree(self, tree, indent=""):
for name, child in tree.children.items():
Expand Down Expand Up @@ -162,7 +164,7 @@ def on_idle_init_paths_tree(self):

def get_lines_from_file(self, path):
try:
return open(path, 'U').readlines()
return open(path).readlines()
except IsADirectoryError:
pass
except FileNotFoundError:
Expand Down