From 670f952aa680f5c141e4ad6efc42cd8d75fdc628 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 7 Feb 2020 22:02:08 +0200 Subject: [PATCH] =?UTF-8?q?Travis=20CI:=20Don=E2=80=99t=20allow=20bare=20e?= =?UTF-8?q?xceptions=20(#1734)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Travis CI: Don’t allow bare exceptions * fixup! Format Python code with psf/black push * except IOError: * except IOError: * Update hamming_code.py * IndexError * Get rid of the nonsense logic Co-authored-by: John Law --- .travis.yml | 2 +- ciphers/transposition_cipher.py | 6 ++++-- ciphers/xor_cipher.py | 4 ++-- hashes/hamming_code.py | 4 ++-- linear_algebra/src/test_linear_algebra.py | 6 +----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80ea13029..bd2dfbbe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: pip install --upgrade pip setuptools install: pip install -r requirements.txt before_script: - black --check . || true - - flake8 . --count --select=E101,E9,F4,F63,F7,F82,W191 --show-source --statistics + - flake8 . --count --select=E101,E722,E9,F4,F63,F7,F82,W191 --show-source --statistics - flake8 . --count --exit-zero --max-line-length=127 --statistics script: - scripts/validate_filenames.py # no uppercase, no spaces, in a directory diff --git a/ciphers/transposition_cipher.py b/ciphers/transposition_cipher.py index 3b69d6b99..4bba88955 100644 --- a/ciphers/transposition_cipher.py +++ b/ciphers/transposition_cipher.py @@ -1,11 +1,13 @@ import math -''' +""" In cryptography, the TRANSPOSITION cipher is a method of encryption where the positions of plaintext are shifted a certain number(determined by the key) that follows a regular system that results in the permuted text, known as the encrypted text. The type of transposition cipher demonstrated under is the ROUTE cipher. -''' +""" + + def main(): message = input("Enter message: ") key = int(input("Enter key [2-%s]: " % (len(message) - 1))) diff --git a/ciphers/xor_cipher.py b/ciphers/xor_cipher.py index 58b535267..0fcfbb0b9 100644 --- a/ciphers/xor_cipher.py +++ b/ciphers/xor_cipher.py @@ -148,7 +148,7 @@ class XORCipher: for line in fin: fout.write(self.encrypt_string(line, key)) - except: + except IOError: return False return True @@ -173,7 +173,7 @@ class XORCipher: for line in fin: fout.write(self.decrypt_string(line, key)) - except: + except IOError: return False return True diff --git a/hashes/hamming_code.py b/hashes/hamming_code.py index 3e0424490..1246e1817 100644 --- a/hashes/hamming_code.py +++ b/hashes/hamming_code.py @@ -125,7 +125,7 @@ def emitterConverter(sizePar, data): if x != None: try: aux = (binPos[contLoop])[-1 * (bp)] - except: + except IndexError: aux = "0" if aux == "1": if x == "1": @@ -229,7 +229,7 @@ def receptorConverter(sizePar, data): if x != None: try: aux = (binPos[contLoop])[-1 * (bp)] - except: + except IndexError: aux = "0" if aux == "1": if x == "1": diff --git a/linear_algebra/src/test_linear_algebra.py b/linear_algebra/src/test_linear_algebra.py index 5e28910af..8d2170e46 100644 --- a/linear_algebra/src/test_linear_algebra.py +++ b/linear_algebra/src/test_linear_algebra.py @@ -19,11 +19,7 @@ class Test(unittest.TestCase): x = Vector([1, 2, 3]) self.assertEqual(x.component(0), 1) self.assertEqual(x.component(2), 3) - try: - y = Vector() - self.assertTrue(False) - except: - self.assertTrue(True) + y = Vector() def test_str(self): """