Skip to content

Commit 27959ef

Browse files
mathommathom
committed
Some PEP8 cleanup
1 parent 25269bb commit 27959ef

8 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎stackify/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
logging.NOTSET: 'NOTSET'
2929
}
3030

31+
3132
class NullHandler(logging.Handler):
3233
def emit(self, record):
3334
pass
@@ -70,6 +71,7 @@ def getLogger(name=None, auto_shutdown=True, basic_config=True, **kwargs):
7071

7172
return logger
7273

74+
7375
def stopLogging(logger):
7476
'''
7577
Shut down the StackifyHandler on a given logger. This will block
@@ -99,4 +101,3 @@ def getHandlers(logger):
99101
Return the StackifyHandlers on a given logger
100102
'''
101103
return [x for x in logger.handlers if isinstance(x, StackifyHandler)]
102-

‎stackify/application.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ def arg_or_env(name, args, default=None):
3232
if default:
3333
return default
3434
else:
35-
raise NameError('You must specify the keyword argument {0} or environment variable {1}'.format(
36-
name, env_name))
35+
raise NameError('You must specify the keyword argument {0} or '
36+
'environment variable {1}'.format(name, env_name))
3737

3838

3939
def get_configuration(**kwargs):
4040
return ApiConfiguration(
41-
application = arg_or_env('application', kwargs),
42-
environment = arg_or_env('environment', kwargs),
43-
api_key = arg_or_env('api_key', kwargs),
44-
api_url = arg_or_env('api_url', kwargs, API_URL))
45-
41+
application=arg_or_env('application', kwargs),
42+
environment=arg_or_env('environment', kwargs),
43+
api_key=arg_or_env('api_key', kwargs),
44+
api_url=arg_or_env('api_url', kwargs, API_URL))

‎stackify/error.py‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
class ErrorItem(JSONObject):
99
def __init__(self):
10-
self.Message = None # exception message
11-
self.ErrorType = None # exception class name
10+
self.Message = None # exception message
11+
self.ErrorType = None # exception class name
1212
self.ErrorTypeCode = None
13-
self.Data = None # custom data
13+
self.Data = None # custom data
1414
self.SourceMethod = None
15-
self.StackTrace = [] # array of TraceFrames
16-
self.InnerError = None # cause?
15+
self.StackTrace = [] # array of TraceFrames
16+
self.InnerError = None # cause?
1717

1818
def load_stack(self, exc_info=None):
1919
if not exc_info:
@@ -58,10 +58,10 @@ def __init__(self):
5858

5959
class StackifyError(JSONObject):
6060
def __init__(self):
61-
self.EnvironmentDetail = None # environment detail object
61+
self.EnvironmentDetail = None # environment detail object
6262
self.OccurredEpochMillis = None
63-
self.Error = None # ErrorItem object
64-
self.WebRequestDetail = None # WebRequestDetail object
63+
self.Error = None # ErrorItem object
64+
self.WebRequestDetail = None # WebRequestDetail object
6565
self.CustomerName = None
6666
self.UserName = None
6767

@@ -72,5 +72,3 @@ def load_exception(self, exc_info=None):
7272
def from_record(self, record):
7373
self.load_exception(record.exc_info)
7474
self.OccurredEpochMillis = int(record.created * 1000)
75-
76-

‎stackify/formats.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33

44
def nonempty(d):
5-
return {k: v for k,v in d.items() if v is not None}
5+
return {k: v for k, v in d.items() if v is not None}
66

77

88
class JSONObject(object):
99
def toJSON(self):
1010
return json.dumps(self, default=lambda x: nonempty(x.__dict__))
11-

‎stackify/handler.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
try:
66
from logging.handlers import QueueHandler, QueueListener
7-
except: # pragma: no cover
7+
except: # pragma: no cover
88
from stackify.handler_backport import QueueHandler, QueueListener
99

1010
try:
1111
import Queue as queue
12-
except ImportError: # pragma: no cover
12+
except ImportError: # pragma: no cover
1313
import queue
1414

1515
from stackify import QUEUE_SIZE, API_URL, MAX_BATCH
@@ -45,7 +45,8 @@ def enqueue(self, record):
4545
self.queue.put_nowait(record)
4646
except queue.Full:
4747
logger = logging.getLogger(__name__)
48-
logger.warn('StackifyHandler queue is full, evicting oldest record')
48+
logger.warn('StackifyHandler queue is full, '
49+
'evicting oldest record')
4950
self.queue.get_nowait()
5051
self.queue.put_nowait(record)
5152

@@ -84,7 +85,8 @@ def send_group(self):
8485
self.http.send_log_group(group)
8586
except:
8687
logger = logging.getLogger(__name__)
87-
logger.exception('Could not send %s log messages, discarding', len(self.messages))
88+
logger.exception('Could not send %s log messages, discarding',
89+
len(self.messages))
8890
del self.messages[:]
8991

9092
def stop(self):
@@ -94,6 +96,6 @@ def stop(self):
9496

9597
# send any remaining messages
9698
if self.messages:
97-
logger.debug('%s messages left on shutdown, uploading', len(self.messages))
99+
logger.debug('%s messages left on shutdown, uploading',
100+
len(self.messages))
98101
self.send_group()
99-

‎stackify/handler_backport.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def start(self):
126126
t.setDaemon(True)
127127
t.start()
128128

129-
def prepare(self , record):
129+
def prepare(self, record):
130130
"""
131131
Prepare a record for handling.
132132
@@ -201,4 +201,3 @@ def stop(self):
201201
self.enqueue_sentinel()
202202
self._thread.join()
203203
self._thread = None
204-

‎stackify/http.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
try:
1010
from StringIO import StringIO
1111
except:
12-
pass # python 3, we use a new function in gzip
12+
pass # python 3, we use a new function in gzip
1313

1414

1515
def gzip_compress(data):
1616
if hasattr(gzip, 'compress'):
17-
return gzip.compress(bytes(data, 'utf-8')) # python 3
17+
return gzip.compress(bytes(data, 'utf-8')) # python 3
1818
else:
1919
s = StringIO()
2020
g = gzip.GzipFile(fileobj=s, mode='w')
@@ -58,8 +58,9 @@ def POST(self, url, json_object, use_gzip=False):
5858
payload_data = gzip_compress(payload_data)
5959

6060
response = requests.post(request_url,
61-
data=payload_data, headers=headers,
62-
timeout=READ_TIMEOUT)
61+
data=payload_data,
62+
headers=headers,
63+
timeout=READ_TIMEOUT)
6364
logger.debug('Response: %s', response.text)
6465
return response.json()
6566
except requests.exceptions.RequestException:
@@ -85,7 +86,7 @@ def send_log_group(self, group):
8586
group.CDID = self.device_id
8687
group.CDAppID = self.device_app_id
8788
group.AppNameID = self.app_name_id
88-
group.ServerName = self.device_alias or self.environment_detail.deviceName
89+
group.ServerName = self.device_alias
90+
if not group.ServerName:
91+
group.ServerName = self.environment_detail.deviceName
8992
self.POST('/Log/Save', group, True)
90-
91-

‎stackify/log.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@
88

99

1010
# this is used to separate builtin keys from user-specified keys
11-
RECORD_VARS = set(logging.LogRecord('','','','','','','','').__dict__.keys())
12-
RECORD_VARS.add('message') # message is saved on the record object by a Formatter sometimes
11+
RECORD_VARS = set(logging.LogRecord('', '', '', '',
12+
'', '', '', '').__dict__.keys())
13+
14+
# the "message" attribute is saved on the record object by a Formatter
15+
RECORD_VARS.add('message')
1316

1417

1518
class LogMsg(JSONObject):
1619
def __init__(self):
1720
self.Msg = None
1821
self.data = None
19-
self.Ex = None # a StackifyError object
22+
self.Ex = None # a StackifyError object
2023
self.Th = None
2124
self.EpochMs = None
2225
self.Level = None
@@ -33,7 +36,8 @@ def from_record(self, record):
3336
self.SrcLine = record.lineno
3437

3538
# check for user-specified keys
36-
data = { k:v for k,v in record.__dict__.items() if k not in RECORD_VARS }
39+
data = {k: v for k, v in record.__dict__.items()
40+
if k not in RECORD_VARS}
3741

3842
if data:
3943
self.data = json.dumps(data, default=lambda x: x.__dict__)
@@ -51,4 +55,3 @@ def __init__(self, msgs, logger=None):
5155
self.CDAppID = None
5256
self.AppNameID = None
5357
self.ServerName = None
54-

0 commit comments

Comments
 (0)