Merge branch 'master' of github.com:sqlmapproject/sqlmap

bdamele · bdamele · commit f52d81c834cc · 2012-12-14T13:40:36.000Z
diff --git a/lib/request/basic.py b/lib/request/basic.py
@@ -245,7 +245,7 @@ def decodePage(page, contentEncoding, contentType):
         # e.g. &#8217;&#8230;&#8482;
         if "&#" in page:
             page = re.sub('&#(\d+);', lambda _: unichr(int(_.group(1))), page)
-        
+
         # e.g. &zeta;
         page = re.sub('&([^;]+);', lambda _: unichr(htmlEntities[_.group(1)]) if htmlEntities.get(_.group(1), 0) > 255 else _.group(0), page)
 
diff --git a/lib/utils/restapi.py b/lib/utils/restapi.py
@@ -5,7 +5,7 @@
 See the file 'doc/COPYING' for copying permission
 """
 
-import argparse
+import optparse
 import os
 import sys
 import threading
@@ -210,12 +210,12 @@ def client(host, port):
     Standalone REST-JSON API wrapper function
     """
 
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-s", "--server", help="Act as a REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store_true", required=False)
-    parser.add_argument("-c", "--client", help="Act as a REST-JSON API client", default=RESTAPI_SERVER_PORT, action="store_true", required=False)
-    parser.add_argument("-H", "--host", help="Host of the REST-JSON API server", default="0.0.0.0", action="store", required=False)
-    parser.add_argument("-p", "--port", help="Port of the the REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store", required=False)
-    args = parser.parse_args()
+    parser = optparse.OptionParser()
+    parser.add_option("-s", "--server", help="Act as a REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store_true")
+    parser.add_option("-c", "--client", help="Act as a REST-JSON API client", default=RESTAPI_SERVER_PORT, action="store_true")
+    parser.add_option("-H", "--host", help="Host of the REST-JSON API server", default="0.0.0.0", action="store")
+    parser.add_option("-p", "--port", help="Port of the the REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store")
+    (args, _) = parser.parse_args()
 
     if args.server is True:
         restAPIrun(args.host, args.port)
diff --git a/tamper/space2mssqlblank.py b/tamper/space2mssqlblank.py
@@ -83,7 +83,7 @@ def tamper(payload, **kwargs):
                     retVal += random.choice(blanks)
 
                 continue        
-                
+
             retVal += payload[i]
 
     return retVal
