diff --git a/flake8_blind_except.py b/flake8_blind_except.py index 295d07b..2b6c752 100644 --- a/flake8_blind_except.py +++ b/flake8_blind_except.py @@ -1,41 +1,37 @@ -try: - import pycodestyle -except ImportError: - import pep8 as pycodestyle import re __version__ = '0.2.1' BLIND_EXCEPT_REGEX = re.compile(r'(^[ \t]*except(.*\b(Base)?Exception\b.*)?:)') # noqa + def check_blind_except(physical_line): """Check for blind except statements. >>> check_blind_except('except:') - (0, 'B901 blind except: statement') + (0, 'BLE901 blind except: statement') >>> check_blind_except('except Exception:') - (0, 'B902 blind except Exception: statement') + (0, 'BLE902 blind except Exception: statement') >>> check_blind_except('except Exception as exc:') - (0, 'B902 blind except Exception: statement') + (0, 'BLE902 blind except Exception: statement') >>> check_blind_except('except ValueError, Exception as exc:') - (0, 'B902 blind except Exception: statement') + (0, 'BLE902 blind except Exception: statement') >>> check_blind_except('except Exception, ValueError as exc:') - (0, 'B902 blind except Exception: statement') + (0, 'BLE902 blind except Exception: statement') >>> check_blind_except('except BaseException as exc:') - (0, 'B902 blind except Exception: statement') + (0, 'BLE902 blind except Exception: statement') >>> check_blind_except('except GoodException as exc: # except:') >>> check_blind_except('except ExceptionGood as exc:') >>> check_blind_except('except Exception') # only trigger with trailing colon >>> check_blind_except('some code containing except: in string') """ - if pycodestyle.noqa(physical_line): - return match = BLIND_EXCEPT_REGEX.search(physical_line) if match: if match.group(2) is None: - return match.start(), 'B901 blind except: statement' + return match.start(), 'BLE901 blind except: statement' else: - return match.start(), 'B902 blind except Exception: statement' + return match.start(), 'BLE902 blind except Exception: statement' + check_blind_except.name = 'flake8-blind-except' check_blind_except.version = __version__ diff --git a/setup.py b/setup.py index 97daa42..b5ba1d7 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def get_long_description(): author_email='elijahcandrews@gmail.com', entry_points={ 'flake8.extension': [ - 'B90 = flake8_blind_except:check_blind_except' + 'BLE90 = flake8_blind_except:check_blind_except' ], }, url='https://github.com/elijahandrews/flake8-blind-except',