Skip to content

Commit

Permalink
Revert PR OpenBazaar#621
Browse files Browse the repository at this point in the history
  • Loading branch information
dionyziz committed Sep 20, 2014
1 parent d50f57f commit d32db58
Show file tree
Hide file tree
Showing 27 changed files with 130 additions and 505 deletions.
326 changes: 0 additions & 326 deletions .pylintrc

This file was deleted.

19 changes: 2 additions & 17 deletions checkstyle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,12 @@ set -o pipefail
ERR=false

function python_check() {
echo "Checking python source files..."

if type pylint2 &>/dev/null; then
PYLINT=pylint2
elif type pylint &>/dev/null; then
PYLINT=pylint
else
echo "pylint not found"
exit
fi

count=0;
for file in $(find . -iname "*.py" -not -path "./env/*"|grep -v pybitmessage|grep -v pysqlcipher); do
if ! $PYLINT --rcfile .pylintrc $file; then
echo "Checking python source: $file"
if ! flake8 --ignore=E501,F811,F821,F403 $file; then
ERR=true
fi
count=$((count+1));
done
if ! $ERR; then
echo "Successfully checked $count files."
fi
}

function js_check() {
Expand Down
1 change: 1 addition & 0 deletions db/migrations/migration1.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def upgrade(db_path):
print 'Upgraded'
except sqlite.Error as e:
print 'Exception: %s' % e
pass # handle the error


def downgrade(db_path):
Expand Down
1 change: 1 addition & 0 deletions db/migrations/migration2.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def upgrade(db_path):
con.commit()
except sqlite.Error as e:
print 'Exception: %s' % e
pass


def downgrade(db_path):
Expand Down
1 change: 1 addition & 0 deletions db/migrations/migration3.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def upgrade(db_path):
con.commit()
except sqlite.Error as e:
print 'Exception: %s' % e
pass


def downgrade(db_path):
Expand Down
Loading

0 comments on commit d32db58

Please sign in to comment.