Fixing help typos (threat9#565)

* Fixing help typos

* Removing pinning pip version

* Pinning pytest requirement

.travis/install.sh

@@ -15,7 +15,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     pyenv global $PYTHON_VERSION
     pyenv rehash
 
-    pip install --user --upgrade pip==9.0.3
     pip install --user virtualenv
     python -m virtualenv ~/.venv
     source ~/.venv/bin/activate

requirements-dev.txt

@@ -3,7 +3,7 @@ requests
 paramiko
 pysnmp==4.4.6
 pycryptodome
-pytest
+pytest==3.6.0
 pytest-forked
 pytest-xdist
 flake8

routersploit/interpreter.py

@@ -261,19 +261,20 @@ def __parse_prompt(self):
 
     def __handle_if_noninteractive(self, argv):
         noninteractive = False
-        module = ''
+        module = ""
         set_opts = []
 
         try:
             opts, args = getopt.getopt(argv, "hxm:s:", ["module=", "set="])
         except getopt.GetoptError:
-            print('rsf.py -m <module>')
+            print_info("{} -m <module> -s \"<option> <value>\"".format(sys.argv[0]))
             sys.exit(2)
+
         for opt, arg in opts:
-            if opt == '-h':
-                print('msf.py -x -m <module> -s "<option> <value"')
+            if opt == "-h":
+                print_info("{} -x -m <module> -s \"<option> <value>\"".format(sys.argv[0]))
                 sys.exit(0)
-            elif opt == '-x':
+            elif opt == "-x":
                 noninteractive = True
             elif opt in ("-m", "--module"):
                 module = arg

tests/exploits/routers/dlink/test_dns_320l_327l_rce.py

@@ -1,5 +1,4 @@
 from unittest import mock
-import ast
 import re
 from flask import request
 from routersploit.modules.exploits.routers.dlink.dns_320l_327l_rce import Exploit
@@ -10,7 +9,7 @@ def apply_response(*args, **kwargs):
     res = re.findall(r"\$\(\((.*-1)\)\)", inj)
     data = "TEST"
     if res:
-        solution = ast.literal_eval(res[0])
+        solution = eval(res[0], {'__builtins__': None})
         data += str(solution)
 
     return data, 200