From d70bd8797acea2647e51d47363ab44ad725ab5f8 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 24 Jan 2016 14:43:03 +0530 Subject: [PATCH] s/exc_info=1/exc_info=True/g --- oml/directory.py | 4 ++-- oml/localnodes.py | 8 ++++---- oml/media/__init__.py | 4 ++-- oml/media/opf.py | 2 +- oml/media/pdf.py | 2 +- oml/meta/loc.py | 2 +- oml/metaremote.py | 2 +- oml/node/server.py | 4 ++-- oml/nodes.py | 12 ++++++------ oml/oxtornado.py | 2 +- oml/tasks.py | 2 +- oml/tor.py | 8 ++++---- oml/update.py | 2 +- oml/websocket.py | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/oml/directory.py b/oml/directory.py index 8a5dea0..fe863c0 100644 --- a/oml/directory.py +++ b/oml/directory.py @@ -26,7 +26,7 @@ def get(vk): opener.addheaders = list(zip(headers.keys(), headers.values())) r = opener.open(url) except: - logger.info('get failed %s', url, exc_info=1) + logger.info('get failed %s', url, exc_info=True) return None sig = r.headers.get('X-Ed25519-Signature') data = r.read() @@ -56,6 +56,6 @@ def put(sk, data): opener.addheaders = list(zip(headers.keys(), headers.values())) r = opener.open(url, data) except: - logger.info('put failed: %s', data, exc_info=1) + logger.info('put failed: %s', data, exc_info=True) return False return r.status == 200 diff --git a/oml/localnodes.py b/oml/localnodes.py index 0f69df8..fd9288a 100644 --- a/oml/localnodes.py +++ b/oml/localnodes.py @@ -44,7 +44,7 @@ def can_connect(data): return True except: pass - #logger.debug('failed to connect to local node %s', data, exc_info=1) + #logger.debug('failed to connect to local node %s', data, exc_info=True) return False @@ -102,7 +102,7 @@ class LocalNodesBase(Thread): self.wait(60) except: if self._active: - logger.debug('receive failed. restart later', exc_info=1) + logger.debug('receive failed. restart later', exc_info=True) self.wait(60) finally: if self._active: @@ -188,7 +188,7 @@ class LocalNodes4(LocalNodesBase): try: s.sendto(packet + b'\0', sockaddr) except: - logger.debug('LocalNodes4.send failed', exc_info=1) + logger.debug('LocalNodes4.send failed', exc_info=True) s.close() def get_socket(self): @@ -222,7 +222,7 @@ class LocalNodes6(LocalNodesBase): try: s.sendto(packet + b'\0', sockaddr) except: - logger.debug('LocalNodes6.send failed', exc_info=1) + logger.debug('LocalNodes6.send failed', exc_info=True) s.close() def get_socket(self): diff --git a/oml/media/__init__.py b/oml/media/__init__.py index ff4e347..428a37d 100644 --- a/oml/media/__init__.py +++ b/oml/media/__init__.py @@ -44,7 +44,7 @@ def metadata(f, from_=None): elif ext == 'txt': info = txt.info(f) except: - logger.debug('failed to load %s info from %s', ext, f, exc_info=1) + logger.debug('failed to load %s info from %s', ext, f, exc_info=True) info = {} opf_info = {} @@ -134,6 +134,6 @@ def extract_text(path): elif ext == 'txt': text = txt.extract_text(path) except: - logger.debug('failed to extract text from %s', path, exc_info=1) + logger.debug('failed to extract text from %s', path, exc_info=True) text = '' return text diff --git a/oml/media/opf.py b/oml/media/opf.py index d462aa6..a3dc40a 100644 --- a/oml/media/opf.py +++ b/oml/media/opf.py @@ -17,7 +17,7 @@ def info(opf): with open(opf, 'rb') as fd: opf = ET.fromstring(fd.read().decode()) except: - logger.debug('failed to load opf %s', opf, exc_info=1) + logger.debug('failed to load opf %s', opf, exc_info=True) return data ns = '{http://www.idpf.org/2007/opf}' metadata = opf.findall(ns + 'metadata')[0] diff --git a/oml/media/pdf.py b/oml/media/pdf.py index 07ae5c5..3bf9de5 100644 --- a/oml/media/pdf.py +++ b/oml/media/pdf.py @@ -164,7 +164,7 @@ def info(pdf): if value and _key not in data: data[_key] = value except: - logger.debug('FAILED TO PARSE %s', pdf, exc_info=1) + logger.debug('FAILED TO PARSE %s', pdf, exc_info=True) ''' cmd = ['pdfinfo', pdf] diff --git a/oml/meta/loc.py b/oml/meta/loc.py index 4dca930..f74822b 100644 --- a/oml/meta/loc.py +++ b/oml/meta/loc.py @@ -48,7 +48,7 @@ def lookup(id): data = read_url(url, timeout=0).decode('utf-8') mods = ET.fromstring(data) except: - logger.debug('lookup for %s url: %s failed', id, url, exc_info=1) + logger.debug('lookup for %s url: %s failed', id, url, exc_info=True) return info title = mods.findall(ns + 'titleInfo') diff --git a/oml/metaremote.py b/oml/metaremote.py index 81ca973..dce0f74 100644 --- a/oml/metaremote.py +++ b/oml/metaremote.py @@ -21,7 +21,7 @@ def request(action, data): try: return json.loads(read_url(url, data, timeout=60).decode('utf-8'))['data'] except: - logger.debug('metadata request failed', exc_info=1) + logger.debug('metadata request failed', exc_info=True) return {} def find(query): diff --git a/oml/node/server.py b/oml/node/server.py index f374404..621c1d0 100644 --- a/oml/node/server.py +++ b/oml/node/server.py @@ -212,7 +212,7 @@ class Handler(http.server.SimpleHTTPRequestHandler): if self.headers.get('Content-Encoding') == 'gzip': data = self.gunzip_data(data) except: - logger.debug('invalid request', exc_info=1) + logger.debug('invalid request', exc_info=True) response_status = (500, 'invalid request') self.write_response(response_status, content) return @@ -229,7 +229,7 @@ class Handler(http.server.SimpleHTTPRequestHandler): try: action, args = json.loads(data.decode('utf-8')) except: - logger.debug('invalid data: %s', data, exc_info=1) + logger.debug('invalid data: %s', data, exc_info=True) response_status = (500, 'invalid request') content = { 'status': 'invalid request' diff --git a/oml/nodes.py b/oml/nodes.py index 4abf068..5c3f930 100644 --- a/oml/nodes.py +++ b/oml/nodes.py @@ -117,7 +117,7 @@ class Node(Thread): try: r = directory.get(vk) except: - logger.debug('directory failed', exc_info=1) + logger.debug('directory failed', exc_info=True) r = None if r and 'id' in r and len(r['id']) == 16: u = self.user @@ -169,7 +169,7 @@ class Node(Thread): self.online = False return None except: - logger.debug('unknown url error', exc_info=1) + logger.debug('unknown url error', exc_info=True) self.online = False return None data = r.read() @@ -304,7 +304,7 @@ class Node(Thread): try: r = self._opener.open(url, timeout=self.TIMEOUT*5) except: - logger.debug('openurl failed %s', url, exc_info=1) + logger.debug('openurl failed %s', url, exc_info=True) return False if r.getcode() == 200: try: @@ -343,7 +343,7 @@ class Node(Thread): self.download_speed = size / duration return item.save_file(content) except: - logger.debug('download failed %s', url, exc_info=1) + logger.debug('download failed %s', url, exc_info=True) return False else: logger.debug('FAILED %s', url) @@ -358,7 +358,7 @@ class Node(Thread): try: r = self._opener.open(url, timeout=self.TIMEOUT*2) except: - logger.debug('openurl failed %s', url, exc_info=1) + logger.debug('openurl failed %s', url, exc_info=True) return False code = r.getcode() if code == 200: @@ -372,7 +372,7 @@ class Node(Thread): icons.clear(key+':') return True except: - logger.debug('preview download failed %s', url, exc_info=1) + logger.debug('preview download failed %s', url, exc_info=True) elif code == 404: pass else: diff --git a/oml/oxtornado.py b/oml/oxtornado.py index 59be046..d0fde49 100644 --- a/oml/oxtornado.py +++ b/oml/oxtornado.py @@ -96,7 +96,7 @@ def api_task(context, request, callback): try: response = f(data) except: - logger.debug('FAILED %s %s', action, data, exc_info=1) + logger.debug('FAILED %s %s', action, data, exc_info=True) response = json_response(status=500, text='%s failed' % action) else: response = json_response(status=400, text='Unknown action %s' % action) diff --git a/oml/tasks.py b/oml/tasks.py index 7e31153..b389306 100644 --- a/oml/tasks.py +++ b/oml/tasks.py @@ -49,7 +49,7 @@ class Tasks(Thread): trigger_event('error', {'error': 'unknown action'}) logger.debug('%s done', action) except: - logger.debug('task failed', exc_info=1) + logger.debug('task failed', exc_info=True) self.q.task_done() def join(self): diff --git a/oml/tor.py b/oml/tor.py index 9544ad4..cc9b81e 100644 --- a/oml/tor.py +++ b/oml/tor.py @@ -156,7 +156,7 @@ class Tor(object): if self.daemon: self.daemon.shutdown() except: - logger.debug('shutdown exception', exc_info=1) + logger.debug('shutdown exception', exc_info=True) pass self.connected = False @@ -196,7 +196,7 @@ class Tor(object): try: self.controller.remove_hidden_service(self.dir) except: - logger.debug('self.controller.remove_hidden_service fail', exc_info=1) + logger.debug('self.controller.remove_hidden_service fail', exc_info=True) state.online = False def is_online(self): @@ -281,7 +281,7 @@ def install_tor(): subprocess.call([desktop, '--register-app'], cwd=os.path.dirname(desktop)) os.unlink(tar_file) except: - logger.debug('tor installation failed', exc_info=1) + logger.debug('tor installation failed', exc_info=True) elif sys.platform == 'darwin': ox.makedirs(target) dmg = os.path.join(target, os.path.basename(url)) @@ -300,6 +300,6 @@ def install_tor(): subprocess.call(['hdiutil', 'unmount', volume]) os.unlink(dmg) except: - logger.debug('tor installation failed', exc_info=1) + logger.debug('tor installation failed', exc_info=True) else: logger.debug('no way to install TorBrowser on %s so far', sys.platform) diff --git a/oml/update.py b/oml/update.py index c960420..c52a64f 100644 --- a/oml/update.py +++ b/oml/update.py @@ -210,7 +210,7 @@ def upgrade_app(): shutil.rmtree(app) shutil.copytree(bundled_app, app) except: - logger.debug('Failed to update Application', exc_info=1) + logger.debug('Failed to update Application', exc_info=True) def getVersion(data): ''' diff --git a/oml/websocket.py b/oml/websocket.py index 20447d0..8c187c9 100644 --- a/oml/websocket.py +++ b/oml/websocket.py @@ -71,4 +71,4 @@ def trigger_event(event, data): try: ws.post(event, data) except: - logger.debug('failed to send to ws %s %s %s', ws, event, data, exc_info=1) + logger.debug('failed to send to ws %s %s %s', ws, event, data, exc_info=True)