From 0b87c8f49731a0516180f47ca9e79dc7989942d5 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 13 Oct 2016 19:24:05 -0400 Subject: [PATCH] Fiddle with the pylint settings. --- .pylintrc | 29 +++++++---------------------- src/dunshire/errors.py | 5 ++++- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.pylintrc b/.pylintrc index d01cab8..118da03 100644 --- a/.pylintrc +++ b/.pylintrc @@ -6,35 +6,20 @@ persistent=no jobs=2 [MESSAGES CONTROL] - - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use"--disable=all --enable=classes -# --disable=W" -disable=cmp-builtin,oct-method,raising-string,long-builtin,delslice-method,parameter-unpacking,dict-iter-method,range-builtin-not-iterating,print-statement,no-absolute-import,old-ne-operator,input-builtin,unicode-builtin,coerce-method,file-builtin,nonzero-method,using-cmp-argument,unpacking-in-except,zip-builtin-not-iterating,setslice-method,execfile-builtin,next-method-called,buffer-builtin,round-builtin,hex-method,standarderror-builtin,old-raise-syntax,cmp-method,xrange-builtin,metaclass-assignment,backtick,getslice-method,indexing-exception,unichr-builtin,coerce-builtin,reload-builtin,dict-view-method,old-division,basestring-builtin,raw_input-builtin,long-suffix,map-builtin-not-iterating,old-octal-literal,apply-builtin,suppressed-message,intern-builtin,import-star-module-level,reduce-builtin,filter-builtin-not-iterating,useless-suppression - +disable= [REPORTS] reports=no [BASIC] - # Allow map() and filter() functions, because why the fuck not? bad-functions= -# Good variable names which should always be accepted, separated by a comma -good-names=b,c,e1,e2,h,A,C,G,K,_K,L,L_matrix,_L,indented_L,M - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=_$|dummy - +# These are all math names from the associated papers. It would be +# more confusing to name them something else and then have to juggle +# them in your head as you switch between the source code and the +# papers. +good-names=a,b,c,D,e1,e2,h,A,C,G,K,_K,L,L_matrix,_L,indented_L,M [MISCELLANEOUS] # List of note tags to take in consideration, separated by a comma. @@ -43,4 +28,4 @@ notes=FIXME,TODO [FORMAT] # Maximum number of characters on a single line. -max-line-length=79 +max-line-length=78 diff --git a/src/dunshire/errors.py b/src/dunshire/errors.py index 99df2a1..0201864 100644 --- a/src/dunshire/errors.py +++ b/src/dunshire/errors.py @@ -118,5 +118,8 @@ class GameUnsolvableException(Exception): tpl = 'Solution failed with result "{:s}."\n' \ 'CVXOPT returned:\n {!s}' cvx_lines = _pretty_format_dict(self._solution_dict).splitlines() - cvx_str = '\n '.join(cvx_lines) # Indent the whole dict by two spaces. + + # Indent the whole dict by two spaces. + cvx_str = '\n '.join(cvx_lines) + return tpl.format(self._solution_dict['status'], cvx_str) -- 2.44.2