Skip to content

Commit

Permalink
Lint newport
Browse files Browse the repository at this point in the history
  • Loading branch information
scasagrande committed Feb 11, 2016
1 parent 4d5bbed commit 72d2485
Show file tree
Hide file tree
Showing 3 changed files with 204 additions and 254 deletions.
2 changes: 1 addition & 1 deletion instruments/.pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ confidence=
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating
disable=redefined-builtin,invalid-name,unsubscriptable-object,too-few-public-methods
disable=redefined-builtin,invalid-name,unsubscriptable-object,too-few-public-methods,fixme

[REPORTS]

Expand Down
7 changes: 7 additions & 0 deletions instruments/instruments/newport/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,13 @@ def __init__(self, errcode=None, timestamp=None):

@staticmethod
def get_message(code):
"""
Returns the error string for a given error code
:param str code: Error code as returned by instrument
:return: Full error code string
:rtype: `str`
"""
return NewportError.messageDict.get(code, "Error code not recognised")

# PROPERTIES ##
Expand Down

0 comments on commit 72d2485

Please sign in to comment.