PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-21 06:59:01 +00:00
Code Issues Projects Releases Wiki Activity

Speedup Zenmap a little further by using cStringIO in zenmap/zenmapCore/NmapParser.py whenever possible (using StringIO as fallback).

Browse Source
This commit is contained in:
jay
2014-06-09 13:35:34 +00:00
parent 28ab4a621d
commit 5e948636cd
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zenmap/zenmapCore/NmapParser.py
View File

@@ -125,9 +125,14 @@ import os
import os.path import os.path
import time import time
import socket import socket
import StringIO
import copy import copy
# Use the faster cStringIO if available, fallback on StringIO if not
try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
# Prevent loading PyXML # Prevent loading PyXML
import xml import xml
xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x]
@@ -476,7 +481,7 @@ class ParserBasics(object):
} }
self.ops = NmapOptions() self.ops = NmapOptions()
self._nmap_output = StringIO.StringIO() self._nmap_output = StringIO()
def set_xml_is_temp(self, xml_is_temp): def set_xml_is_temp(self, xml_is_temp):
# This flag is False if a user has specified his own -oX option - in # This flag is False if a user has specified his own -oX option - in
@@ -503,7 +508,8 @@ class ParserBasics(object):
def set_nmap_output(self, nmap_output): def set_nmap_output(self, nmap_output):
self._nmap_output.close() self._nmap_output.close()
del self._nmap_output del self._nmap_output
self._nmap_output = StringIO.StringIO(nmap_output) self._nmap_output = StringIO()
self._nmap_output.write(nmap_output)
def del_nmap_output(self): def del_nmap_output(self):
self._nmap_output.close() self._nmap_output.close()
@@ -1092,7 +1098,7 @@ class NmapParserSAX(ParserBasics, ContentHandler):
def get_xml(self): def get_xml(self):
"""Return a string containing the XML representation of this scan.""" """Return a string containing the XML representation of this scan."""
buffer = StringIO.StringIO() buffer = StringIO()
self.write_xml(buffer) self.write_xml(buffer)
string = buffer.getvalue() string = buffer.getvalue()
buffer.close() buffer.close()
@@ -1362,7 +1368,7 @@ class NmapParserSAX(ParserBasics, ContentHandler):
class OverrideEntityResolver(EntityResolver): class OverrideEntityResolver(EntityResolver):
"""This class overrides the default behavior of xml.sax to download """This class overrides the default behavior of xml.sax to download
remote DTDs, instead returning blank strings""" remote DTDs, instead returning blank strings"""
empty = StringIO.StringIO() empty = StringIO()
def resolveEntity(self, publicId, systemId): def resolveEntity(self, publicId, systemId):
return OverrideEntityResolver.empty return OverrideEntityResolver.empty