1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11:28 +00:00

Remove some unneeded imports of re, and compile one pattern

This commit is contained in:
dmiller
2014-01-08 23:09:32 +00:00
parent b254234118
commit 3c9eeb3608
8 changed files with 3 additions and 11 deletions

View File

@@ -135,7 +135,7 @@ HOSTS_HEADER = ['ID', '#', 'Hosts']
DIMENSION = (700, 400) DIMENSION = (700, 400)
IP_RE = '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$' IP_RE = re.compile('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$')
class HostsViewer(BWMainWindow): class HostsViewer(BWMainWindow):
@@ -275,8 +275,8 @@ class HostsList(gtk.ScrolledWindow):
value1 = treemodel.get_value(iter1, 2) value1 = treemodel.get_value(iter1, 2)
value2 = treemodel.get_value(iter2, 2) value2 = treemodel.get_value(iter2, 2)
value1_is_ip = re.search(IP_RE, value1) value1_is_ip = IP_RE.match(value1)
value2_is_ip = re.search(IP_RE, value2) value2_is_ip = IP_RE.match(value2)
if value1_is_ip and value2_is_ip: if value1_is_ip and value2_is_ip:
return ipv4_compare(value1, value2) return ipv4_compare(value1, value2)

View File

@@ -124,7 +124,6 @@ from radialnet.gui.RadialNet import NetNode
import zenmapCore.NmapParser import zenmapCore.NmapParser
import math import math
import re
COLORS = [(0.0, 1.0, 0.0), COLORS = [(0.0, 1.0, 0.0),

View File

@@ -121,7 +121,6 @@
# ***************************************************************************/ # ***************************************************************************/
import os import os
import re
import unittest import unittest
import zenmapCore import zenmapCore
import zenmapCore.NmapParser import zenmapCore.NmapParser

View File

@@ -128,7 +128,6 @@ import errno
import locale import locale
import sys import sys
import os import os
import re
import tempfile import tempfile
import unittest import unittest

View File

@@ -120,7 +120,6 @@
# * * # * *
# ***************************************************************************/ # ***************************************************************************/
import re
import locale import locale
import os import os
import os.path import os.path

View File

@@ -120,8 +120,6 @@
# * * # * *
# ***************************************************************************/ # ***************************************************************************/
import re
from optparse import OptionParser from optparse import OptionParser
from zenmapCore.Name import APP_NAME, NMAP_DISPLAY_NAME from zenmapCore.Name import APP_NAME, NMAP_DISPLAY_NAME
from zenmapCore.Version import VERSION from zenmapCore.Version import VERSION

View File

@@ -124,7 +124,6 @@ import errno
import gtk import gtk
import gobject import gobject
import os import os
import re
import time import time
import xml.sax import xml.sax

View File

@@ -125,7 +125,6 @@ import gobject
import gtk import gtk
import sys import sys
import tempfile import tempfile
import re
import xml.sax import xml.sax
from zenmapGUI.higwidgets.higwindows import HIGWindow from zenmapGUI.higwidgets.higwindows import HIGWindow