Skip to content

[pull] py3 from HelloZeroNet:py3 #140

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

Merged
pull merged 1 commit into from
Mar 25, 2020
+3 −6
Merged

[pull] py3 from HelloZeroNet:py3 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions plugins/MergerSite/MergerSitePlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,6 @@ def getDbFiles(self):

# Also notice merger sites on a merged site file change
def onUpdated(self, inner_path, file=None):
if inner_path == "content.json":
site_manager.updateMergerSites()

super(SiteStoragePlugin, self).onUpdated(inner_path, file)

merged_type = merged_db.get(self.site.address)
Expand Down Expand Up @@ -397,6 +394,6 @@ def load(self, *args, **kwags):
super(SiteManagerPlugin, self).load(*args, **kwags)
self.updateMergerSites()

def save(self, *args, **kwags):
super(SiteManagerPlugin, self).save(*args, **kwags)
def saveDelayed(self, *args, **kwags):
super(SiteManagerPlugin, self).saveDelayed(*args, **kwags)
self.updateMergerSites()
2 changes: 1 addition & 1 deletion src/Config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Config(object):

def __init__(self, argv):
self.version = "0.7.1"
self.rev = 4471
self.rev = 4473
self.argv = argv
self.action = None
self.test_parser = None
Expand Down