Skip to content

Commit

Permalink
Fixing lint errors (threat9#580)
Browse files Browse the repository at this point in the history
* Fixing lint errors

* Installing newest pytest

* Upgrading pip on travis

* Force pytest version 4.4.0
  • Loading branch information
lucyoa authored Apr 7, 2019
1 parent 50bcbb6 commit dcbfe68
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
source ~/.venv/bin/activate
fi

python -m pip install --upgrade pip
python -m pip install -r requirements-dev.txt
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requests
paramiko
pysnmp==4.4.6
pycryptodome
pytest==3.6.0
pytest==4.4.0
pytest-forked
pytest-xdist
flake8
Expand Down
2 changes: 1 addition & 1 deletion routersploit/core/bluetooth/btle/btle_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def __init__(self, addr, iface):
def _update(self, resp):
ScanEntry._update(self, resp)

if self.addrType is "random":
if self.addrType == "random":
self.vendor = "None (Random MAC address)"
else:
self.vendor = lookup_vendor(self.addr)
Expand Down
2 changes: 1 addition & 1 deletion routersploit/core/exploit/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def shell(exploit, architecture="", method="", payloads=None, **params):
module = getattr(importlib.import_module("{}{}".format(payload_path, p)), 'Payload')

# if method/arch is cmd then filter out payloads
if method is "cmd":
if method == "cmd":
if getattr(module, "cmd") in payloads:
available_payloads[p] = module
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def check(self):
if response is None:
return False # target is not vulnerable

if response.status_code is 200:
if response.status_code == 200:
res = re.findall(r"IPFire ([\d.]{4}) \([\w]+\) - Core Update ([\d]+)", response.text)
if res:
version = res[0][0]
Expand Down

0 comments on commit dcbfe68

Please sign in to comment.