From dcc5e859a5f7201ae5012a70974fad890ce2588d Mon Sep 17 00:00:00 2001 From: j Date: Fri, 11 Jan 2019 15:18:53 +0530 Subject: [PATCH] style --- oml/db.py | 2 +- oml/item/api.py | 2 +- oml/library.py | 10 +++++----- oml/pdict.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/oml/db.py b/oml/db.py index 01f2574..c2b19ad 100644 --- a/oml/db.py +++ b/oml/db.py @@ -116,7 +116,7 @@ def drop_columns(table, columns): } create_table = get_create_table(table) for column in columns: - create_table = re.sub('(%s .*?,)'%column, '', create_table) + create_table = re.sub('(%s .*?,)' % column, '', create_table) create_table = create_table.replace('\n', '').replace(',', ',\n') create_table = re.sub('\n *', '\n ', create_table).replace('( ', '(\n ') sql = [ diff --git a/oml/item/api.py b/oml/item/api.py index 6bd441c..0fd7a6a 100644 --- a/oml/item/api.py +++ b/oml/item/api.py @@ -9,7 +9,7 @@ from sqlalchemy.sql.expression import text from sqlalchemy import func from oxtornado import actions -import utils #utils must be imported before websocket to avoid loop +import utils # utils must be imported before websocket to avoid loop from websocket import trigger_event import meta from . import models diff --git a/oml/library.py b/oml/library.py index 5590944..d61398f 100644 --- a/oml/library.py +++ b/oml/library.py @@ -93,7 +93,7 @@ class Peer(object): elif action == 'edititem': itemid, meta = args item = self.library.get(itemid, {}) - if not 'meta' in item: + if 'meta' not in item: item['meta'] = meta else: item['meta'].update(meta) @@ -111,7 +111,7 @@ class Peer(object): name = args[0] if len(args) > 1: query = args[1] - if not name in self.info['lists']: + if name not in self.info['lists']: self.info['lists'][name] = [] elif action == 'editlist': name, new = args @@ -127,7 +127,7 @@ class Peer(object): del self.info['lists'][name] elif action == 'addlistitems': name, ids = args - if not name in self.info['lists']: + if name not in self.info['lists']: self.info['lists'][name] = [] self.info['lists'][name] = list(set(self.info['lists'][name]) | set(ids)) elif action == 'removelistitems': @@ -141,14 +141,14 @@ class Peer(object): # fixme, just trigger peer update here from user.models import User peer = User.get_or_create(peerid) - if not 'username' in peer.info: + if 'username' not in peer.info: peer.info['username'] = username peer.update_name() peer.save() elif action == 'editpeer': peerid, data = args if len(peerid) == 16: - if not peerid in self.info['peers']: + if peerid not in self.info['peers']: self.info['peers'][peerid] = {} for key in ('username', 'contact'): if key in data: diff --git a/oml/pdict.py b/oml/pdict.py index bd20b3e..a648d24 100644 --- a/oml/pdict.py +++ b/oml/pdict.py @@ -21,7 +21,7 @@ class pdict(dict): json.dump(self, fd, indent=4, sort_keys=True, ensure_ascii=False) def get(self, key, default=None): - if default == None and self._defaults: + if default is None and self._defaults: default = self._defaults.get(key) return dict.get(self, key, default)