Fix module/variable shadowing#15

progval wants to merge 1 commit intohyperboria:masterhyperboria/python-cjdns:masterfrom

progval:patch-2progval/python-cjdns:patch-2Copy head branch name to clipboard