kallithea Files · whitespacecleanup.sh

Files @ b580691553f5

Branch filter:

Location: kallithea/whitespacecleanup.sh - annotation

b580691553f5 880 B text/x-sh Show Source Show as Raw Download as Raw

Søren Løvborg

auth: turn dead AuthUser code into assertion

The result of db.User.get_dict never contains the keys 'api_keys' or
'permissions'. The keys returned by get_dict are 1) all the User table
columns, 2) the keys explicitly defined in User.__json__, and 3) the
keys defined in User.get_api_data, none of which include the two
blacklisted keys.

'api_keys' would be returned if __json__ called get_api_data with
argument details=True; but currently that is not the case.

In case there's a reason why these two keys must never appear in an
AuthUser object, the check has not been removed entirely; instead, it's
been turned into an assertion. This way, it will be noticed if __json__
is later modified to request detailed API data, for instance.

9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49
9cf229b46e49

#!/bin/bash -x

# Enforce some consistency in whitespace - just to avoid spurious whitespaces changes

files=`hg loc '*.py' '*.html' '*.css' '*.rst' '*.txt' '*.js' | egrep -v '/lockfiles.py|LICENSE-MERGELY.html|/codemirror/|/fontello/|(graph|mergely|native.history|select2/select2|yui.flot)\.js$'`
sed -i "s,`printf '\t'`,    ,g" $files
sed -i "s,  *$,,g" $files

sed -i 's,\([^ /]\){,\1 {,g' `hg loc '*.css'`
sed -i 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'`

sed -i 's/^\(    [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css
sed -i '1s|, |,|g' kallithea/public/css/{style,contextbar}.css
sed -i 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css
sed -i 's/^\([^ ,/].*\)   */\1 /g' kallithea/public/css/{style,contextbar}.css
sed -i 's,^--$,-- ,g' kallithea/templates/email_templates/main.txt

hg diff