(Arne Babenhauserheide)
2012-11-20: refactor freenet priv key identifier into a global private variable. refactor freenet priv key identifier into a global private variable.
diff --git a/staticsite.py b/staticsite.py
--- a/staticsite.py
+++ b/staticsite.py
@@ -30,6 +30,7 @@ from mercurial.i18n import _
from mercurial import hg, discovery, util, extensions
_staticidentifier = ".statichgrepo"
+_freenetprivkeystring = "AQECAAE/"
templates = {
"head": """<!DOCTYPE html>
@@ -393,7 +394,7 @@ def getincoming(ui, repo, otheruri, othe
# cannot do that for ftp or freenet insertion uris (freenet
# separates insertion and retrieval by private/public key)
isftpuri = otheruri.startswith("ftp://")
- isfreenetpriv = "AQECAAE/" in otheruri
+ isfreenetpriv = _freenetprivkeystring in otheruri
if isftpuri or isfreenetpriv:
chlist = []
return chlist, cleanupfn, other
@@ -469,8 +470,7 @@ def getforkinfo(ui, target):
def safeuri(uri):
"""Shareable uris: Hide password + hide freenet insert keys."""
uri = util.hidepassword(uri)
- freenetpriv = "AQECAAE/"
- if "USK@" in uri and freenetpriv in uri:
+ if "USK@" in uri and _freenetprivkeystring in uri:
uri = "freenet://USK@******" + uri[uri.index(freenetpriv)+len(freenetpriv)-1:]
return uri