diff --git a/desktop_client.py b/desktop_client.py index 3a7d4193d..4d3f94ae4 100644 --- a/desktop_client.py +++ b/desktop_client.py @@ -1442,7 +1442,7 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str, _desktopShowBanner() print('No posts\n') if proxyType == 'tor': - print('You may need to run the desktop client ' + \ + print('You may need to run the desktop client ' + 'with the --http option') # wait for a while, or until a key is pressed diff --git a/static_analysis b/static_analysis index b237a5261..33e135b83 100755 --- a/static_analysis +++ b/static_analysis @@ -8,17 +8,6 @@ fi echo "Starting static analysis" -for sourceFile in epicyon/*.py -do - result=$($cmd "$sourceFile") - if [ "$result" ]; then - echo '' - echo "$result" - exit 1 - fi - echo -n '.' -done - for sourceFile in *.py do result=$($cmd "$sourceFile") diff --git a/tests.py b/tests.py index 3eda974d4..9b7fa8ec9 100644 --- a/tests.py +++ b/tests.py @@ -266,11 +266,15 @@ def testHttpSigNew(): domain, port, boxpath, httpPrefix, messageBodyJsonStr, 'rsa-sha256') - assert signatureIndexHeader == \ + expectedIndexHeader = \ 'keyId="https://example.com/users/foo#main-key"; ' + \ 'alg=hs2019; created=' + str(secondsSinceEpoch) + '; ' + \ 'sig1=(*request-target, *created, host, date, ' + \ 'digest, content-type, content-length)' + if signatureIndexHeader != expectedIndexHeader: + print('Unexpected new http header: ' + signatureIndexHeader) + print('Should be: ' + expectedIndexHeader) + assert signatureIndexHeader == expectedIndexHeader assert signatureHeader == \ 'sig1=:LQU1PcJILSp1Q30GWINusfftYYKfTtam7InSu2c+ZzfGC' + \ 'bTSevRgifZFuG2asFi8ubG/uUVHiBwIxxIz1u/JyWC3lYIFgjQF' + \ diff --git a/webapp_login.py b/webapp_login.py index 0b47a2f8c..e488d5f46 100644 --- a/webapp_login.py +++ b/webapp_login.py @@ -42,9 +42,7 @@ def htmlGetLoginCredentials(loginParams: str, nickname = nickname[1:] if '@' in nickname: # the full nickname@domain has been entered - handleDomain = nickname.split('@')[1].strip() - if handleDomain == domain: - nickname = nickname.split('@')[0] + nickname = nickname.split('@')[0] elif arg.split('=', 1)[0] == 'password': password = arg.split('=', 1)[1] elif arg.split('=', 1)[0] == 'register': diff --git a/webapp_profile.py b/webapp_profile.py index 0161947e5..fd2893cb2 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1753,12 +1753,14 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, 'style="height:200px" spellcheck="false">' + \ allowedInstancesStr + '\n' - editProfileForm += \ - ' ' + \ - translate['Git Projects'] + '\n' + editProfileForm += ' \n' + + editProfileForm += '' + \ + translate['Git Projects'] + '\n' + editProfileForm += ' \n' idx = 'List of project names that you wish to receive git patches for' editProfileForm += \ - ' ' + \ + ' ' + \ translate[idx] + '\n' editProfileForm += \ '