0001-Make-ndiff-support-python3.patch 68 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531153215331534153515361537153815391540154115421543154415451546154715481549155015511552155315541555155615571558155915601561156215631564156515661567156815691570157115721573157415751576157715781579158015811582158315841585158615871588158915901591159215931594159515961597159815991600160116021603160416051606160716081609161016111612161316141615161616171618161916201621162216231624162516261627162816291630163116321633163416351636163716381639164016411642164316441645164616471648164916501651165216531654165516561657165816591660166116621663166416651666166716681669167016711672167316741675167616771678167916801681168216831684168516861687168816891690169116921693169416951696169716981699170017011702170317041705170617071708170917101711171217131714171517161717171817191720
  1. From bbbf474b2ebdbdac4d557e3351210f3fe2175c33 Mon Sep 17 00:00:00 2001
  2. From: Mingli Yu <mingli.yu@windriver.com>
  3. Date: Fri, 14 Feb 2020 10:09:55 +0000
  4. Subject: [PATCH] Make ndiff support python3
  5. Backport a patch from debian to make ndiff support
  6. python3.
  7. Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch
  8. Upstream-Status: Pending
  9. Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  10. ---
  11. Makefile.in | 12 +-
  12. ndiff/ndiff.py | 495 +++++++++++++++++-----------------
  13. ndiff/ndifftest.py | 94 +++----
  14. ndiff/scripts/ndiff | 14 +-
  15. ndiff/setup.py | 34 +--
  16. ndiff/test-scans/anonymize.py | 18 +-
  17. 6 files changed, 333 insertions(+), 334 deletions(-)
  18. mode change 100644 => 100755 ndiff/setup.py
  19. diff --git a/Makefile.in b/Makefile.in
  20. index eee8863..32f86ba 100644
  21. --- a/Makefile.in
  22. +++ b/Makefile.in
  23. @@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@
  24. NDIFFDIR = @NDIFFDIR@
  25. NPINGDIR = @NPINGDIR@
  26. PYTHON = @PYTHON@
  27. +PYTHON3 = /usr/bin/env python3
  28. DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
  29. # With GCC, add extra security checks to source code.
  30. # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
  31. @@ -260,7 +261,7 @@ clean-zenmap:
  32. rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc
  33. clean-ndiff:
  34. - -cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all
  35. + -cd $(NDIFFDIR) && $(PYTHON3) setup.py clean --all
  36. clean-nping:
  37. -cd $(NPINGDIR) && $(MAKE) clean
  38. @@ -368,6 +369,7 @@ tests/check_dns: $(OBJS)
  39. # this as the location of the interpreter whenever we're not doing a
  40. # local installation.
  41. DEFAULT_PYTHON_PATH = /usr/bin/env python
  42. +DEFAULT_PYTHON3_PATH = /usr/bin/env python3
  43. build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py
  44. # When DESTDIR is defined, assume we're building an executable
  45. @@ -388,13 +390,13 @@ install-zenmap: $(ZENMAPDIR)/setup.py
  46. ln -sf zenmap $(DESTDIR)$(bindir)/xnmap
  47. build-ndiff:
  48. - cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
  49. + cd $(NDIFFDIR) && $(PYTHON3) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON3_PATH)")
  50. build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@
  51. @cd $(NPINGDIR) && $(MAKE)
  52. install-ndiff:
  53. - cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)")
  54. + cd $(NDIFFDIR) && $(PYTHON3) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)")
  55. NSE_FILES = scripts/script.db scripts/*.nse
  56. NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc
  57. @@ -443,7 +445,7 @@ uninstall-zenmap:
  58. rm -f $(DESTDIR)$(bindir)/xnmap
  59. uninstall-ndiff:
  60. - cd $(NDIFFDIR) && $(PYTHON) setup.py uninstall
  61. + cd $(NDIFFDIR) && $(PYTHON3) setup.py uninstall
  62. uninstall-ncat:
  63. @cd $(NCATDIR) && $(MAKE) uninstall
  64. @@ -458,7 +460,7 @@ check-ncat:
  65. @cd $(NCATDIR) && $(MAKE) check
  66. check-ndiff:
  67. - @cd $(NDIFFDIR) && $(PYTHON) ndifftest.py
  68. + @cd $(NDIFFDIR) && $(PYTHON3) ndifftest.py
  69. check-nsock:
  70. @cd $(NSOCKDIR)/src && $(MAKE) check
  71. diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py
  72. index 043273f..abbd1c5 100755
  73. --- a/ndiff/ndiff.py
  74. +++ b/ndiff/ndiff.py
  75. @@ -1,4 +1,4 @@
  76. -#!/usr/bin/env python
  77. +#!/usr/bin/env python3
  78. # Ndiff
  79. #
  80. @@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x]
  81. import xml.sax
  82. import xml.sax.saxutils
  83. import xml.dom.minidom
  84. -from StringIO import StringIO
  85. +from io import StringIO
  86. verbose = False
  87. -NDIFF_XML_VERSION = u"1"
  88. +NDIFF_XML_VERSION = "1"
  89. class OverrideEntityResolver(xml.sax.handler.EntityResolver):
  90. @@ -78,35 +78,35 @@ class Scan(object):
  91. def write_nmaprun_open(self, writer):
  92. attrs = {}
  93. if self.scanner is not None:
  94. - attrs[u"scanner"] = self.scanner
  95. + attrs["scanner"] = self.scanner
  96. if self.args is not None:
  97. - attrs[u"args"] = self.args
  98. + attrs["args"] = self.args
  99. if self.start_date is not None:
  100. - attrs[u"start"] = "%d" % time.mktime(self.start_date.timetuple())
  101. - attrs[u"startstr"] = self.start_date.strftime(
  102. + attrs["start"] = "%d" % time.mktime(self.start_date.timetuple())
  103. + attrs["startstr"] = self.start_date.strftime(
  104. "%a %b %d %H:%M:%S %Y")
  105. if self.version is not None:
  106. - attrs[u"version"] = self.version
  107. - writer.startElement(u"nmaprun", attrs)
  108. + attrs["version"] = self.version
  109. + writer.startElement("nmaprun", attrs)
  110. def write_nmaprun_close(self, writer):
  111. - writer.endElement(u"nmaprun")
  112. + writer.endElement("nmaprun")
  113. def nmaprun_to_dom_fragment(self, document):
  114. frag = document.createDocumentFragment()
  115. - elem = document.createElement(u"nmaprun")
  116. + elem = document.createElement("nmaprun")
  117. if self.scanner is not None:
  118. - elem.setAttribute(u"scanner", self.scanner)
  119. + elem.setAttribute("scanner", self.scanner)
  120. if self.args is not None:
  121. - elem.setAttribute(u"args", self.args)
  122. + elem.setAttribute("args", self.args)
  123. if self.start_date is not None:
  124. elem.setAttribute(
  125. - u"start", "%d" % time.mktime(self.start_date.timetuple()))
  126. + "start", "%d" % time.mktime(self.start_date.timetuple()))
  127. elem.setAttribute(
  128. - u"startstr",
  129. + "startstr",
  130. self.start_date.strftime("%a %b %d %H:%M:%S %Y"))
  131. if self.version is not None:
  132. - elem.setAttribute(u"version", self.version)
  133. + elem.setAttribute("version", self.version)
  134. frag.appendChild(elem)
  135. return frag
  136. @@ -136,17 +136,17 @@ class Host(object):
  137. def format_name(self):
  138. """Return a human-readable identifier for this host."""
  139. - address_s = u", ".join(a.s for a in sorted(self.addresses))
  140. - hostname_s = u", ".join(sorted(self.hostnames))
  141. + address_s = ", ".join(a.s for a in sorted(self.addresses))
  142. + hostname_s = ", ".join(sorted(self.hostnames))
  143. if len(hostname_s) > 0:
  144. if len(address_s) > 0:
  145. - return u"%s (%s)" % (hostname_s, address_s)
  146. + return "%s (%s)" % (hostname_s, address_s)
  147. else:
  148. return hostname_s
  149. elif len(address_s) > 0:
  150. return address_s
  151. else:
  152. - return u"<no name>"
  153. + return "<no name>"
  154. def add_port(self, port):
  155. self.ports[port.spec] = port
  156. @@ -163,46 +163,46 @@ class Host(object):
  157. return state is None or state in self.extraports
  158. def extraports_string(self):
  159. - list = [(count, state) for (state, count) in self.extraports.items()]
  160. + locallist = [(count, state) for (state, count) in list(self.extraports.items())]
  161. # Reverse-sort by count.
  162. - list.sort(reverse=True)
  163. - return u", ".join(
  164. - [u"%d %s ports" % (count, state) for (count, state) in list])
  165. + locallist.sort(reverse=True)
  166. + return ", ".join(
  167. + ["%d %s ports" % (count, state) for (count, state) in locallist])
  168. def state_to_dom_fragment(self, document):
  169. frag = document.createDocumentFragment()
  170. if self.state is not None:
  171. - elem = document.createElement(u"status")
  172. - elem.setAttribute(u"state", self.state)
  173. + elem = document.createElement("status")
  174. + elem.setAttribute("state", self.state)
  175. frag.appendChild(elem)
  176. return frag
  177. def hostname_to_dom_fragment(self, document, hostname):
  178. frag = document.createDocumentFragment()
  179. - elem = document.createElement(u"hostname")
  180. - elem.setAttribute(u"name", hostname)
  181. + elem = document.createElement("hostname")
  182. + elem.setAttribute("name", hostname)
  183. frag.appendChild(elem)
  184. return frag
  185. def extraports_to_dom_fragment(self, document):
  186. frag = document.createDocumentFragment()
  187. - for state, count in self.extraports.items():
  188. - elem = document.createElement(u"extraports")
  189. - elem.setAttribute(u"state", state)
  190. - elem.setAttribute(u"count", unicode(count))
  191. + for state, count in list(self.extraports.items()):
  192. + elem = document.createElement("extraports")
  193. + elem.setAttribute("state", state)
  194. + elem.setAttribute("count", str(count))
  195. frag.appendChild(elem)
  196. return frag
  197. def os_to_dom_fragment(self, document, os):
  198. frag = document.createDocumentFragment()
  199. - elem = document.createElement(u"osmatch")
  200. - elem.setAttribute(u"name", os)
  201. + elem = document.createElement("osmatch")
  202. + elem.setAttribute("name", os)
  203. frag.appendChild(elem)
  204. return frag
  205. def to_dom_fragment(self, document):
  206. frag = document.createDocumentFragment()
  207. - elem = document.createElement(u"host")
  208. + elem = document.createElement("host")
  209. if self.state is not None:
  210. elem.appendChild(self.state_to_dom_fragment(document))
  211. @@ -211,13 +211,13 @@ class Host(object):
  212. elem.appendChild(addr.to_dom_fragment(document))
  213. if len(self.hostnames) > 0:
  214. - hostnames_elem = document.createElement(u"hostnames")
  215. + hostnames_elem = document.createElement("hostnames")
  216. for hostname in self.hostnames:
  217. hostnames_elem.appendChild(
  218. self.hostname_to_dom_fragment(document, hostname))
  219. elem.appendChild(hostnames_elem)
  220. - ports_elem = document.createElement(u"ports")
  221. + ports_elem = document.createElement("ports")
  222. ports_elem.appendChild(self.extraports_to_dom_fragment(document))
  223. for port in sorted(self.ports.values()):
  224. if not self.is_extraports(port.state):
  225. @@ -226,13 +226,13 @@ class Host(object):
  226. elem.appendChild(ports_elem)
  227. if len(self.os) > 0:
  228. - os_elem = document.createElement(u"os")
  229. + os_elem = document.createElement("os")
  230. for os in self.os:
  231. os_elem.appendChild(self.os_to_dom_fragment(document, os))
  232. elem.appendChild(os_elem)
  233. if len(self.script_results) > 0:
  234. - hostscript_elem = document.createElement(u"hostscript")
  235. + hostscript_elem = document.createElement("hostscript")
  236. for sr in self.script_results:
  237. hostscript_elem.appendChild(sr.to_dom_fragment(document))
  238. elem.appendChild(hostscript_elem)
  239. @@ -246,7 +246,7 @@ class Address(object):
  240. self.s = s
  241. def __eq__(self, other):
  242. - return self.__cmp__(other) == 0
  243. + return self.sort_key() == other.sort_key()
  244. def __ne__(self, other):
  245. return not self.__eq__(other)
  246. @@ -254,8 +254,8 @@ class Address(object):
  247. def __hash__(self):
  248. return hash(self.sort_key())
  249. - def __cmp__(self, other):
  250. - return cmp(self.sort_key(), other.sort_key())
  251. + def __lt__(self, other):
  252. + return self.sort_key() < other.sort_key()
  253. def __str__(self):
  254. return str(self.s)
  255. @@ -264,21 +264,21 @@ class Address(object):
  256. return self.s
  257. def new(type, s):
  258. - if type == u"ipv4":
  259. + if type == "ipv4":
  260. return IPv4Address(s)
  261. - elif type == u"ipv6":
  262. + elif type == "ipv6":
  263. return IPv6Address(s)
  264. - elif type == u"mac":
  265. + elif type == "mac":
  266. return MACAddress(s)
  267. else:
  268. - raise ValueError(u"Unknown address type %s." % type)
  269. + raise ValueError("Unknown address type %s." % type)
  270. new = staticmethod(new)
  271. def to_dom_fragment(self, document):
  272. frag = document.createDocumentFragment()
  273. - elem = document.createElement(u"address")
  274. - elem.setAttribute(u"addr", self.s)
  275. - elem.setAttribute(u"addrtype", self.type)
  276. + elem = document.createElement("address")
  277. + elem.setAttribute("addr", self.s)
  278. + elem.setAttribute("addrtype", self.type)
  279. frag.appendChild(elem)
  280. return frag
  281. @@ -287,21 +287,21 @@ class Address(object):
  282. class IPv4Address(Address):
  283. - type = property(lambda self: u"ipv4")
  284. + type = property(lambda self: "ipv4")
  285. def sort_key(self):
  286. return (0, self.s)
  287. class IPv6Address(Address):
  288. - type = property(lambda self: u"ipv6")
  289. + type = property(lambda self: "ipv6")
  290. def sort_key(self):
  291. return (1, self.s)
  292. class MACAddress(Address):
  293. - type = property(lambda self: u"mac")
  294. + type = property(lambda self: "mac")
  295. def sort_key(self):
  296. return (2, self.s)
  297. @@ -320,28 +320,25 @@ class Port(object):
  298. def state_string(self):
  299. if self.state is None:
  300. - return u"unknown"
  301. + return "unknown"
  302. else:
  303. - return unicode(self.state)
  304. + return str(self.state)
  305. def spec_string(self):
  306. - return u"%d/%s" % self.spec
  307. + return "%d/%s" % self.spec
  308. - def __cmp__(self, other):
  309. - d = cmp(self.spec, other.spec)
  310. - if d != 0:
  311. - return d
  312. - return cmp((self.spec, self.service, self.script_results),
  313. - (other.spec, other.service, other.script_results))
  314. + def __lt__(self, other):
  315. + return (self.spec, self.service, self.script_results) < (
  316. + other.spec, other.service, other.script_results)
  317. def to_dom_fragment(self, document):
  318. frag = document.createDocumentFragment()
  319. - elem = document.createElement(u"port")
  320. - elem.setAttribute(u"portid", unicode(self.spec[0]))
  321. - elem.setAttribute(u"protocol", self.spec[1])
  322. + elem = document.createElement("port")
  323. + elem.setAttribute("portid", str(self.spec[0]))
  324. + elem.setAttribute("protocol", self.spec[1])
  325. if self.state is not None:
  326. - state_elem = document.createElement(u"state")
  327. - state_elem.setAttribute(u"state", self.state)
  328. + state_elem = document.createElement("state")
  329. + state_elem.setAttribute("state", self.state)
  330. elem.appendChild(state_elem)
  331. elem.appendChild(self.service.to_dom_fragment(document))
  332. for sr in self.script_results:
  333. @@ -385,7 +382,7 @@ class Service(object):
  334. if len(parts) == 0:
  335. return None
  336. else:
  337. - return u"/".join(parts)
  338. + return "/".join(parts)
  339. def version_string(self):
  340. """Get a string like in the VERSION column of Nmap output."""
  341. @@ -395,17 +392,17 @@ class Service(object):
  342. if self.version is not None:
  343. parts.append(self.version)
  344. if self.extrainfo is not None:
  345. - parts.append(u"(%s)" % self.extrainfo)
  346. + parts.append("(%s)" % self.extrainfo)
  347. if len(parts) == 0:
  348. return None
  349. else:
  350. - return u" ".join(parts)
  351. + return " ".join(parts)
  352. def to_dom_fragment(self, document):
  353. frag = document.createDocumentFragment()
  354. - elem = document.createElement(u"service")
  355. - for attr in (u"name", u"product", u"version", u"extrainfo", u"tunnel"):
  356. + elem = document.createElement("service")
  357. + for attr in ("name", "product", "version", "extrainfo", "tunnel"):
  358. v = getattr(self, attr)
  359. if v is None:
  360. continue
  361. @@ -435,53 +432,53 @@ class ScriptResult(object):
  362. result = []
  363. lines = self.output.splitlines()
  364. if len(lines) > 0:
  365. - lines[0] = self.id + u": " + lines[0]
  366. + lines[0] = self.id + ": " + lines[0]
  367. for line in lines[:-1]:
  368. - result.append(u"| " + line)
  369. + result.append("| " + line)
  370. if len(lines) > 0:
  371. - result.append(u"|_ " + lines[-1])
  372. + result.append("|_ " + lines[-1])
  373. return result
  374. def to_dom_fragment(self, document):
  375. frag = document.createDocumentFragment()
  376. - elem = document.createElement(u"script")
  377. - elem.setAttribute(u"id", self.id)
  378. - elem.setAttribute(u"output", self.output)
  379. + elem = document.createElement("script")
  380. + elem.setAttribute("id", self.id)
  381. + elem.setAttribute("output", self.output)
  382. frag.appendChild(elem)
  383. return frag
  384. def format_banner(scan):
  385. """Format a startup banner more or less like Nmap does."""
  386. - scanner = u"Nmap"
  387. - if scan.scanner is not None and scan.scanner != u"nmap":
  388. + scanner = "Nmap"
  389. + if scan.scanner is not None and scan.scanner != "nmap":
  390. scanner = scan.scanner
  391. parts = [scanner]
  392. if scan.version is not None:
  393. parts.append(scan.version)
  394. - parts.append(u"scan")
  395. + parts.append("scan")
  396. if scan.start_date is not None:
  397. - parts.append(u"initiated %s" % scan.start_date.strftime(
  398. + parts.append("initiated %s" % scan.start_date.strftime(
  399. "%a %b %d %H:%M:%S %Y"))
  400. if scan.args is not None:
  401. - parts.append(u"as: %s" % scan.args)
  402. - return u" ".join(parts)
  403. + parts.append("as: %s" % scan.args)
  404. + return " ".join(parts)
  405. def print_script_result_diffs_text(title, script_results_a, script_results_b,
  406. script_result_diffs, f=sys.stdout):
  407. - table = Table(u"*")
  408. + table = Table("*")
  409. for sr_diff in script_result_diffs:
  410. sr_diff.append_to_port_table(table)
  411. if len(table) > 0:
  412. - print >> f
  413. + print(file=f)
  414. if len(script_results_b) == 0:
  415. - print >> f, u"-%s:" % title
  416. + print("-%s:" % title, file=f)
  417. elif len(script_results_a) == 0:
  418. - print >> f, u"+%s:" % title
  419. + print("+%s:" % title, file=f)
  420. else:
  421. - print >> f, u" %s:" % title
  422. - print >> f, table
  423. + print(" %s:" % title, file=f)
  424. + print(table, file=f)
  425. def script_result_diffs_to_dom_fragment(elem, script_results_a,
  426. @@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a,
  427. if len(script_results_a) == 0 and len(script_results_b) == 0:
  428. return document.createDocumentFragment()
  429. elif len(script_results_b) == 0:
  430. - a_elem = document.createElement(u"a")
  431. + a_elem = document.createElement("a")
  432. for sr in script_results_a:
  433. elem.appendChild(sr.to_dom_fragment(document))
  434. a_elem.appendChild(elem)
  435. return a_elem
  436. elif len(script_results_a) == 0:
  437. - b_elem = document.createElement(u"b")
  438. + b_elem = document.createElement("b")
  439. for sr in script_results_b:
  440. elem.appendChild(sr.to_dom_fragment(document))
  441. b_elem.appendChild(elem)
  442. @@ -581,10 +578,10 @@ class ScanDiffText(ScanDiff):
  443. banner_a = format_banner(self.scan_a)
  444. banner_b = format_banner(self.scan_b)
  445. if banner_a != banner_b:
  446. - print >> self.f, u"-%s" % banner_a
  447. - print >> self.f, u"+%s" % banner_b
  448. + print("-%s" % banner_a, file=self.f)
  449. + print("+%s" % banner_b, file=self.f)
  450. elif verbose:
  451. - print >> self.f, u" %s" % banner_a
  452. + print(" %s" % banner_a, file=self.f)
  453. def output_pre_scripts(self, pre_script_result_diffs):
  454. print_script_result_diffs_text("Pre-scan script results",
  455. @@ -597,7 +594,7 @@ class ScanDiffText(ScanDiff):
  456. post_script_result_diffs, self.f)
  457. def output_host_diff(self, h_diff):
  458. - print >> self.f
  459. + print(file=self.f)
  460. h_diff.print_text(self.f)
  461. def output_ending(self):
  462. @@ -622,8 +619,8 @@ class ScanDiffXML(ScanDiff):
  463. def output_beginning(self):
  464. self.writer.startDocument()
  465. - self.writer.startElement(u"nmapdiff", {u"version": NDIFF_XML_VERSION})
  466. - self.writer.startElement(u"scandiff", {})
  467. + self.writer.startElement("nmapdiff", {"version": NDIFF_XML_VERSION})
  468. + self.writer.startElement("scandiff", {})
  469. if self.nmaprun_differs():
  470. self.writer.frag_a(
  471. @@ -636,7 +633,7 @@ class ScanDiffXML(ScanDiff):
  472. def output_pre_scripts(self, pre_script_result_diffs):
  473. if len(pre_script_result_diffs) > 0 or verbose:
  474. - prescript_elem = self.document.createElement(u"prescript")
  475. + prescript_elem = self.document.createElement("prescript")
  476. frag = script_result_diffs_to_dom_fragment(
  477. prescript_elem, self.scan_a.pre_script_results,
  478. self.scan_b.pre_script_results, pre_script_result_diffs,
  479. @@ -646,7 +643,7 @@ class ScanDiffXML(ScanDiff):
  480. def output_post_scripts(self, post_script_result_diffs):
  481. if len(post_script_result_diffs) > 0 or verbose:
  482. - postscript_elem = self.document.createElement(u"postscript")
  483. + postscript_elem = self.document.createElement("postscript")
  484. frag = script_result_diffs_to_dom_fragment(
  485. postscript_elem, self.scan_a.post_script_results,
  486. self.scan_b.post_script_results, post_script_result_diffs,
  487. @@ -660,8 +657,8 @@ class ScanDiffXML(ScanDiff):
  488. frag.unlink()
  489. def output_ending(self):
  490. - self.writer.endElement(u"scandiff")
  491. - self.writer.endElement(u"nmapdiff")
  492. + self.writer.endElement("scandiff")
  493. + self.writer.endElement("nmapdiff")
  494. self.writer.endDocument()
  495. @@ -719,9 +716,9 @@ class HostDiff(object):
  496. self.cost += os_cost
  497. extraports_a = tuple((count, state)
  498. - for (state, count) in self.host_a.extraports.items())
  499. + for (state, count) in list(self.host_a.extraports.items()))
  500. extraports_b = tuple((count, state)
  501. - for (state, count) in self.host_b.extraports.items())
  502. + for (state, count) in list(self.host_b.extraports.items()))
  503. if extraports_a != extraports_b:
  504. self.extraports_changed = True
  505. self.cost += 1
  506. @@ -747,69 +744,69 @@ class HostDiff(object):
  507. # Names and addresses.
  508. if self.id_changed:
  509. if host_a.state is not None:
  510. - print >> f, u"-%s:" % host_a.format_name()
  511. + print("-%s:" % host_a.format_name(), file=f)
  512. if self.host_b.state is not None:
  513. - print >> f, u"+%s:" % host_b.format_name()
  514. + print("+%s:" % host_b.format_name(), file=f)
  515. else:
  516. - print >> f, u" %s:" % host_a.format_name()
  517. + print(" %s:" % host_a.format_name(), file=f)
  518. # State.
  519. if self.state_changed:
  520. if host_a.state is not None:
  521. - print >> f, u"-Host is %s." % host_a.state
  522. + print("-Host is %s." % host_a.state, file=f)
  523. if host_b.state is not None:
  524. - print >> f, u"+Host is %s." % host_b.state
  525. + print("+Host is %s." % host_b.state, file=f)
  526. elif verbose:
  527. - print >> f, u" Host is %s." % host_b.state
  528. + print(" Host is %s." % host_b.state, file=f)
  529. # Extraports.
  530. if self.extraports_changed:
  531. if len(host_a.extraports) > 0:
  532. - print >> f, u"-Not shown: %s" % host_a.extraports_string()
  533. + print("-Not shown: %s" % host_a.extraports_string(), file=f)
  534. if len(host_b.extraports) > 0:
  535. - print >> f, u"+Not shown: %s" % host_b.extraports_string()
  536. + print("+Not shown: %s" % host_b.extraports_string(), file=f)
  537. elif verbose:
  538. if len(host_a.extraports) > 0:
  539. - print >> f, u" Not shown: %s" % host_a.extraports_string()
  540. + print(" Not shown: %s" % host_a.extraports_string(), file=f)
  541. # Port table.
  542. - port_table = Table(u"** * * *")
  543. + port_table = Table("** * * *")
  544. if host_a.state is None:
  545. - mark = u"+"
  546. + mark = "+"
  547. elif host_b.state is None:
  548. - mark = u"-"
  549. + mark = "-"
  550. else:
  551. - mark = u" "
  552. - port_table.append((mark, u"PORT", u"STATE", u"SERVICE", u"VERSION"))
  553. + mark = " "
  554. + port_table.append((mark, "PORT", "STATE", "SERVICE", "VERSION"))
  555. for port in self.ports:
  556. port_diff = self.port_diffs[port]
  557. port_diff.append_to_port_table(port_table, host_a, host_b)
  558. if len(port_table) > 1:
  559. - print >> f, port_table
  560. + print(port_table, file=f)
  561. # OS changes.
  562. if self.os_changed or verbose:
  563. if len(host_a.os) > 0:
  564. if len(host_b.os) > 0:
  565. - print >> f, u" OS details:"
  566. + print(" OS details:", file=f)
  567. else:
  568. - print >> f, u"-OS details:"
  569. + print("-OS details:", file=f)
  570. elif len(host_b.os) > 0:
  571. - print >> f, u"+OS details:"
  572. + print("+OS details:", file=f)
  573. # os_diffs is a list of 5-tuples returned by
  574. # difflib.SequenceMatcher.
  575. for op, i1, i2, j1, j2 in self.os_diffs:
  576. if op == "replace" or op == "delete":
  577. for i in range(i1, i2):
  578. - print >> f, "- %s" % host_a.os[i]
  579. + print("- %s" % host_a.os[i], file=f)
  580. if op == "replace" or op == "insert":
  581. for i in range(j1, j2):
  582. - print >> f, "+ %s" % host_b.os[i]
  583. + print("+ %s" % host_b.os[i], file=f)
  584. if op == "equal":
  585. for i in range(i1, i2):
  586. - print >> f, " %s" % host_a.os[i]
  587. + print(" %s" % host_a.os[i], file=f)
  588. print_script_result_diffs_text("Host script results",
  589. host_a.script_results, host_b.script_results,
  590. @@ -820,32 +817,32 @@ class HostDiff(object):
  591. host_b = self.host_b
  592. frag = document.createDocumentFragment()
  593. - hostdiff_elem = document.createElement(u"hostdiff")
  594. + hostdiff_elem = document.createElement("hostdiff")
  595. frag.appendChild(hostdiff_elem)
  596. if host_a.state is None or host_b.state is None:
  597. # The host is missing in one scan. Output the whole thing.
  598. if host_a.state is not None:
  599. - a_elem = document.createElement(u"a")
  600. + a_elem = document.createElement("a")
  601. a_elem.appendChild(host_a.to_dom_fragment(document))
  602. hostdiff_elem.appendChild(a_elem)
  603. elif host_b.state is not None:
  604. - b_elem = document.createElement(u"b")
  605. + b_elem = document.createElement("b")
  606. b_elem.appendChild(host_b.to_dom_fragment(document))
  607. hostdiff_elem.appendChild(b_elem)
  608. return frag
  609. - host_elem = document.createElement(u"host")
  610. + host_elem = document.createElement("host")
  611. # State.
  612. if host_a.state == host_b.state:
  613. if verbose:
  614. host_elem.appendChild(host_a.state_to_dom_fragment(document))
  615. else:
  616. - a_elem = document.createElement(u"a")
  617. + a_elem = document.createElement("a")
  618. a_elem.appendChild(host_a.state_to_dom_fragment(document))
  619. host_elem.appendChild(a_elem)
  620. - b_elem = document.createElement(u"b")
  621. + b_elem = document.createElement("b")
  622. b_elem.appendChild(host_b.state_to_dom_fragment(document))
  623. host_elem.appendChild(b_elem)
  624. @@ -854,31 +851,31 @@ class HostDiff(object):
  625. addrset_b = set(host_b.addresses)
  626. for addr in sorted(addrset_a.intersection(addrset_b)):
  627. host_elem.appendChild(addr.to_dom_fragment(document))
  628. - a_elem = document.createElement(u"a")
  629. + a_elem = document.createElement("a")
  630. for addr in sorted(addrset_a - addrset_b):
  631. a_elem.appendChild(addr.to_dom_fragment(document))
  632. if a_elem.hasChildNodes():
  633. host_elem.appendChild(a_elem)
  634. - b_elem = document.createElement(u"b")
  635. + b_elem = document.createElement("b")
  636. for addr in sorted(addrset_b - addrset_a):
  637. b_elem.appendChild(addr.to_dom_fragment(document))
  638. if b_elem.hasChildNodes():
  639. host_elem.appendChild(b_elem)
  640. # Host names.
  641. - hostnames_elem = document.createElement(u"hostnames")
  642. + hostnames_elem = document.createElement("hostnames")
  643. hostnameset_a = set(host_a.hostnames)
  644. hostnameset_b = set(host_b.hostnames)
  645. for hostname in sorted(hostnameset_a.intersection(hostnameset_b)):
  646. hostnames_elem.appendChild(
  647. host_a.hostname_to_dom_fragment(document, hostname))
  648. - a_elem = document.createElement(u"a")
  649. + a_elem = document.createElement("a")
  650. for hostname in sorted(hostnameset_a - hostnameset_b):
  651. a_elem.appendChild(
  652. host_a.hostname_to_dom_fragment(document, hostname))
  653. if a_elem.hasChildNodes():
  654. hostnames_elem.appendChild(a_elem)
  655. - b_elem = document.createElement(u"b")
  656. + b_elem = document.createElement("b")
  657. for hostname in sorted(hostnameset_b - hostnameset_a):
  658. b_elem.appendChild(
  659. host_b.hostname_to_dom_fragment(document, hostname))
  660. @@ -887,15 +884,15 @@ class HostDiff(object):
  661. if hostnames_elem.hasChildNodes():
  662. host_elem.appendChild(hostnames_elem)
  663. - ports_elem = document.createElement(u"ports")
  664. + ports_elem = document.createElement("ports")
  665. # Extraports.
  666. if host_a.extraports == host_b.extraports:
  667. ports_elem.appendChild(host_a.extraports_to_dom_fragment(document))
  668. else:
  669. - a_elem = document.createElement(u"a")
  670. + a_elem = document.createElement("a")
  671. a_elem.appendChild(host_a.extraports_to_dom_fragment(document))
  672. ports_elem.appendChild(a_elem)
  673. - b_elem = document.createElement(u"b")
  674. + b_elem = document.createElement("b")
  675. b_elem.appendChild(host_b.extraports_to_dom_fragment(document))
  676. ports_elem.appendChild(b_elem)
  677. # Port list.
  678. @@ -911,18 +908,18 @@ class HostDiff(object):
  679. # OS changes.
  680. if self.os_changed or verbose:
  681. - os_elem = document.createElement(u"os")
  682. + os_elem = document.createElement("os")
  683. # os_diffs is a list of 5-tuples returned by
  684. # difflib.SequenceMatcher.
  685. for op, i1, i2, j1, j2 in self.os_diffs:
  686. if op == "replace" or op == "delete":
  687. - a_elem = document.createElement(u"a")
  688. + a_elem = document.createElement("a")
  689. for i in range(i1, i2):
  690. a_elem.appendChild(host_a.os_to_dom_fragment(
  691. document, host_a.os[i]))
  692. os_elem.appendChild(a_elem)
  693. if op == "replace" or op == "insert":
  694. - b_elem = document.createElement(u"b")
  695. + b_elem = document.createElement("b")
  696. for i in range(j1, j2):
  697. b_elem.appendChild(host_b.os_to_dom_fragment(
  698. document, host_b.os[i]))
  699. @@ -936,7 +933,7 @@ class HostDiff(object):
  700. # Host script changes.
  701. if len(self.script_result_diffs) > 0 or verbose:
  702. - hostscript_elem = document.createElement(u"hostscript")
  703. + hostscript_elem = document.createElement("hostscript")
  704. host_elem.appendChild(script_result_diffs_to_dom_fragment(
  705. hostscript_elem, host_a.script_results,
  706. host_b.script_results, self.script_result_diffs,
  707. @@ -989,38 +986,38 @@ class PortDiff(object):
  708. self.port_b.service.version_string()]
  709. if a_columns == b_columns:
  710. if verbose or self.script_result_diffs > 0:
  711. - table.append([u" "] + a_columns)
  712. + table.append([" "] + a_columns)
  713. else:
  714. if not host_a.is_extraports(self.port_a.state):
  715. - table.append([u"-"] + a_columns)
  716. + table.append(["-"] + a_columns)
  717. if not host_b.is_extraports(self.port_b.state):
  718. - table.append([u"+"] + b_columns)
  719. + table.append(["+"] + b_columns)
  720. for sr_diff in self.script_result_diffs:
  721. sr_diff.append_to_port_table(table)
  722. def to_dom_fragment(self, document):
  723. frag = document.createDocumentFragment()
  724. - portdiff_elem = document.createElement(u"portdiff")
  725. + portdiff_elem = document.createElement("portdiff")
  726. frag.appendChild(portdiff_elem)
  727. if (self.port_a.spec == self.port_b.spec and
  728. self.port_a.state == self.port_b.state):
  729. - port_elem = document.createElement(u"port")
  730. - port_elem.setAttribute(u"portid", unicode(self.port_a.spec[0]))
  731. - port_elem.setAttribute(u"protocol", self.port_a.spec[1])
  732. + port_elem = document.createElement("port")
  733. + port_elem.setAttribute("portid", str(self.port_a.spec[0]))
  734. + port_elem.setAttribute("protocol", self.port_a.spec[1])
  735. if self.port_a.state is not None:
  736. - state_elem = document.createElement(u"state")
  737. - state_elem.setAttribute(u"state", self.port_a.state)
  738. + state_elem = document.createElement("state")
  739. + state_elem.setAttribute("state", self.port_a.state)
  740. port_elem.appendChild(state_elem)
  741. if self.port_a.service == self.port_b.service:
  742. port_elem.appendChild(
  743. self.port_a.service.to_dom_fragment(document))
  744. else:
  745. - a_elem = document.createElement(u"a")
  746. + a_elem = document.createElement("a")
  747. a_elem.appendChild(
  748. self.port_a.service.to_dom_fragment(document))
  749. port_elem.appendChild(a_elem)
  750. - b_elem = document.createElement(u"b")
  751. + b_elem = document.createElement("b")
  752. b_elem.appendChild(
  753. self.port_b.service.to_dom_fragment(document))
  754. port_elem.appendChild(b_elem)
  755. @@ -1028,10 +1025,10 @@ class PortDiff(object):
  756. port_elem.appendChild(sr_diff.to_dom_fragment(document))
  757. portdiff_elem.appendChild(port_elem)
  758. else:
  759. - a_elem = document.createElement(u"a")
  760. + a_elem = document.createElement("a")
  761. a_elem.appendChild(self.port_a.to_dom_fragment(document))
  762. portdiff_elem.appendChild(a_elem)
  763. - b_elem = document.createElement(u"b")
  764. + b_elem = document.createElement("b")
  765. b_elem.appendChild(self.port_b.to_dom_fragment(document))
  766. portdiff_elem.appendChild(b_elem)
  767. @@ -1086,13 +1083,13 @@ class ScriptResultDiff(object):
  768. for op, i1, i2, j1, j2 in diffs.get_opcodes():
  769. if op == "replace" or op == "delete":
  770. for k in range(i1, i2):
  771. - table.append_raw(u"-" + a_lines[k])
  772. + table.append_raw("-" + a_lines[k])
  773. if op == "replace" or op == "insert":
  774. for k in range(j1, j2):
  775. - table.append_raw(u"+" + b_lines[k])
  776. + table.append_raw("+" + b_lines[k])
  777. if op == "equal":
  778. for k in range(i1, i2):
  779. - table.append_raw(u" " + a_lines[k])
  780. + table.append_raw(" " + a_lines[k])
  781. def to_dom_fragment(self, document):
  782. frag = document.createDocumentFragment()
  783. @@ -1102,11 +1099,11 @@ class ScriptResultDiff(object):
  784. frag.appendChild(self.sr_a.to_dom_fragment(document))
  785. else:
  786. if self.sr_a is not None:
  787. - a_elem = document.createElement(u"a")
  788. + a_elem = document.createElement("a")
  789. a_elem.appendChild(self.sr_a.to_dom_fragment(document))
  790. frag.appendChild(a_elem)
  791. if self.sr_b is not None:
  792. - b_elem = document.createElement(u"b")
  793. + b_elem = document.createElement("b")
  794. b_elem.appendChild(self.sr_b.to_dom_fragment(document))
  795. frag.appendChild(b_elem)
  796. return frag
  797. @@ -1120,7 +1117,7 @@ class Table(object):
  798. copied to the output."""
  799. self.widths = []
  800. self.rows = []
  801. - self.prefix = u""
  802. + self.prefix = ""
  803. self.padding = []
  804. j = 0
  805. while j < len(template) and template[j] != "*":
  806. @@ -1145,7 +1142,7 @@ class Table(object):
  807. for i in range(len(row)):
  808. if row[i] is None:
  809. - s = u""
  810. + s = ""
  811. else:
  812. s = str(row[i])
  813. if i == len(self.widths):
  814. @@ -1167,7 +1164,7 @@ class Table(object):
  815. for row in self.rows:
  816. parts = [self.prefix]
  817. i = 0
  818. - if isinstance(row, basestring):
  819. + if isinstance(row, str):
  820. # A raw string.
  821. lines.append(row)
  822. else:
  823. @@ -1176,13 +1173,13 @@ class Table(object):
  824. if i < len(self.padding):
  825. parts.append(self.padding[i])
  826. i += 1
  827. - lines.append(u"".join(parts).rstrip())
  828. - return u"\n".join(lines)
  829. + lines.append("".join(parts).rstrip())
  830. + return "\n".join(lines)
  831. def warn(str):
  832. """Print a warning to stderr."""
  833. - print >> sys.stderr, str
  834. + print(str, file=sys.stderr)
  835. class NmapContentHandler(xml.sax.handler.ContentHandler):
  836. @@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
  837. self.current_port = None
  838. self._start_elem_handlers = {
  839. - u"nmaprun": self._start_nmaprun,
  840. - u"host": self._start_host,
  841. - u"status": self._start_status,
  842. - u"address": self._start_address,
  843. - u"hostname": self._start_hostname,
  844. - u"extraports": self._start_extraports,
  845. - u"port": self._start_port,
  846. - u"state": self._start_state,
  847. - u"service": self._start_service,
  848. - u"script": self._start_script,
  849. - u"osmatch": self._start_osmatch,
  850. - u"finished": self._start_finished,
  851. + "nmaprun": self._start_nmaprun,
  852. + "host": self._start_host,
  853. + "status": self._start_status,
  854. + "address": self._start_address,
  855. + "hostname": self._start_hostname,
  856. + "extraports": self._start_extraports,
  857. + "port": self._start_port,
  858. + "state": self._start_state,
  859. + "service": self._start_service,
  860. + "script": self._start_script,
  861. + "osmatch": self._start_osmatch,
  862. + "finished": self._start_finished,
  863. }
  864. self._end_elem_handlers = {
  865. - u'host': self._end_host,
  866. - u'port': self._end_port,
  867. + 'host': self._end_host,
  868. + 'port': self._end_port,
  869. }
  870. def parent_element(self):
  871. @@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
  872. def _start_nmaprun(self, name, attrs):
  873. assert self.parent_element() is None
  874. if "start" in attrs:
  875. - start_timestamp = int(attrs.get(u"start"))
  876. + start_timestamp = int(attrs.get("start"))
  877. self.scan.start_date = datetime.datetime.fromtimestamp(
  878. start_timestamp)
  879. - self.scan.scanner = attrs.get(u"scanner")
  880. - self.scan.args = attrs.get(u"args")
  881. - self.scan.version = attrs.get(u"version")
  882. + self.scan.scanner = attrs.get("scanner")
  883. + self.scan.args = attrs.get("args")
  884. + self.scan.version = attrs.get("version")
  885. def _start_host(self, name, attrs):
  886. - assert self.parent_element() == u"nmaprun"
  887. + assert self.parent_element() == "nmaprun"
  888. self.current_host = Host()
  889. self.scan.hosts.append(self.current_host)
  890. def _start_status(self, name, attrs):
  891. - assert self.parent_element() == u"host"
  892. + assert self.parent_element() == "host"
  893. assert self.current_host is not None
  894. - state = attrs.get(u"state")
  895. + state = attrs.get("state")
  896. if state is None:
  897. warn(u'%s element of host %s is missing the "state" attribute; '
  898. - 'assuming \unknown\.' % (
  899. + r'assuming \unknown\.' % (
  900. name, self.current_host.format_name()))
  901. return
  902. self.current_host.state = state
  903. def _start_address(self, name, attrs):
  904. - assert self.parent_element() == u"host"
  905. + assert self.parent_element() == "host"
  906. assert self.current_host is not None
  907. - addr = attrs.get(u"addr")
  908. + addr = attrs.get("addr")
  909. if addr is None:
  910. - warn(u'%s element of host %s is missing the "addr" '
  911. + warn('%s element of host %s is missing the "addr" '
  912. 'attribute; skipping.' % (
  913. name, self.current_host.format_name()))
  914. return
  915. - addrtype = attrs.get(u"addrtype", u"ipv4")
  916. + addrtype = attrs.get("addrtype", "ipv4")
  917. self.current_host.add_address(Address.new(addrtype, addr))
  918. def _start_hostname(self, name, attrs):
  919. - assert self.parent_element() == u"hostnames"
  920. + assert self.parent_element() == "hostnames"
  921. assert self.current_host is not None
  922. - hostname = attrs.get(u"name")
  923. + hostname = attrs.get("name")
  924. if hostname is None:
  925. - warn(u'%s element of host %s is missing the "name" '
  926. + warn('%s element of host %s is missing the "name" '
  927. 'attribute; skipping.' % (
  928. name, self.current_host.format_name()))
  929. return
  930. self.current_host.add_hostname(hostname)
  931. def _start_extraports(self, name, attrs):
  932. - assert self.parent_element() == u"ports"
  933. + assert self.parent_element() == "ports"
  934. assert self.current_host is not None
  935. - state = attrs.get(u"state")
  936. + state = attrs.get("state")
  937. if state is None:
  938. - warn(u'%s element of host %s is missing the "state" '
  939. + warn('%s element of host %s is missing the "state" '
  940. 'attribute; assuming "unknown".' % (
  941. name, self.current_host.format_name()))
  942. state = None
  943. if state in self.current_host.extraports:
  944. - warn(u'Duplicate extraports state "%s" in host %s.' % (
  945. + warn('Duplicate extraports state "%s" in host %s.' % (
  946. state, self.current_host.format_name()))
  947. - count = attrs.get(u"count")
  948. + count = attrs.get("count")
  949. if count is None:
  950. - warn(u'%s element of host %s is missing the "count" '
  951. + warn('%s element of host %s is missing the "count" '
  952. 'attribute; assuming 0.' % (
  953. name, self.current_host.format_name()))
  954. count = 0
  955. @@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
  956. try:
  957. count = int(count)
  958. except ValueError:
  959. - warn(u"Can't convert extraports count \"%s\" "
  960. + warn("Can't convert extraports count \"%s\" "
  961. "to an integer in host %s; assuming 0." % (
  962. - attrs[u"count"], self.current_host.format_name()))
  963. + attrs["count"], self.current_host.format_name()))
  964. count = 0
  965. self.current_host.extraports[state] = count
  966. def _start_port(self, name, attrs):
  967. - assert self.parent_element() == u"ports"
  968. + assert self.parent_element() == "ports"
  969. assert self.current_host is not None
  970. - portid_str = attrs.get(u"portid")
  971. + portid_str = attrs.get("portid")
  972. if portid_str is None:
  973. - warn(u'%s element of host %s missing the "portid" '
  974. + warn('%s element of host %s missing the "portid" '
  975. 'attribute; skipping.' % (
  976. name, self.current_host.format_name()))
  977. return
  978. try:
  979. portid = int(portid_str)
  980. except ValueError:
  981. - warn(u"Can't convert portid \"%s\" to an integer "
  982. + warn("Can't convert portid \"%s\" to an integer "
  983. "in host %s; skipping port." % (
  984. portid_str, self.current_host.format_name()))
  985. return
  986. - protocol = attrs.get(u"protocol")
  987. + protocol = attrs.get("protocol")
  988. if protocol is None:
  989. - warn(u'%s element of host %s missing the "protocol" '
  990. + warn('%s element of host %s missing the "protocol" '
  991. 'attribute; skipping.' % (
  992. name, self.current_host.format_name()))
  993. return
  994. self.current_port = Port((portid, protocol))
  995. def _start_state(self, name, attrs):
  996. - assert self.parent_element() == u"port"
  997. + assert self.parent_element() == "port"
  998. assert self.current_host is not None
  999. if self.current_port is None:
  1000. return
  1001. if "state" not in attrs:
  1002. - warn(u'%s element of port %s is missing the "state" '
  1003. + warn('%s element of port %s is missing the "state" '
  1004. 'attribute; assuming "unknown".' % (
  1005. name, self.current_port.spec_string()))
  1006. return
  1007. - self.current_port.state = attrs[u"state"]
  1008. + self.current_port.state = attrs["state"]
  1009. self.current_host.add_port(self.current_port)
  1010. def _start_service(self, name, attrs):
  1011. - assert self.parent_element() == u"port"
  1012. + assert self.parent_element() == "port"
  1013. assert self.current_host is not None
  1014. if self.current_port is None:
  1015. return
  1016. - self.current_port.service.name = attrs.get(u"name")
  1017. - self.current_port.service.product = attrs.get(u"product")
  1018. - self.current_port.service.version = attrs.get(u"version")
  1019. - self.current_port.service.extrainfo = attrs.get(u"extrainfo")
  1020. - self.current_port.service.tunnel = attrs.get(u"tunnel")
  1021. + self.current_port.service.name = attrs.get("name")
  1022. + self.current_port.service.product = attrs.get("product")
  1023. + self.current_port.service.version = attrs.get("version")
  1024. + self.current_port.service.extrainfo = attrs.get("extrainfo")
  1025. + self.current_port.service.tunnel = attrs.get("tunnel")
  1026. def _start_script(self, name, attrs):
  1027. result = ScriptResult()
  1028. - result.id = attrs.get(u"id")
  1029. + result.id = attrs.get("id")
  1030. if result.id is None:
  1031. - warn(u'%s element missing the "id" attribute; skipping.' % name)
  1032. + warn('%s element missing the "id" attribute; skipping.' % name)
  1033. return
  1034. - result.output = attrs.get(u"output")
  1035. + result.output = attrs.get("output")
  1036. if result.output is None:
  1037. - warn(u'%s element missing the "output" attribute; skipping.'
  1038. + warn('%s element missing the "output" attribute; skipping.'
  1039. % name)
  1040. return
  1041. - if self.parent_element() == u"prescript":
  1042. + if self.parent_element() == "prescript":
  1043. self.scan.pre_script_results.append(result)
  1044. - elif self.parent_element() == u"postscript":
  1045. + elif self.parent_element() == "postscript":
  1046. self.scan.post_script_results.append(result)
  1047. - elif self.parent_element() == u"hostscript":
  1048. + elif self.parent_element() == "hostscript":
  1049. self.current_host.script_results.append(result)
  1050. - elif self.parent_element() == u"port":
  1051. + elif self.parent_element() == "port":
  1052. self.current_port.script_results.append(result)
  1053. else:
  1054. - warn(u"%s element not inside prescript, postscript, hostscript, "
  1055. + warn("%s element not inside prescript, postscript, hostscript, "
  1056. "or port element; ignoring." % name)
  1057. return
  1058. def _start_osmatch(self, name, attrs):
  1059. - assert self.parent_element() == u"os"
  1060. + assert self.parent_element() == "os"
  1061. assert self.current_host is not None
  1062. if "name" not in attrs:
  1063. - warn(u'%s element of host %s is missing the "name" '
  1064. + warn('%s element of host %s is missing the "name" '
  1065. 'attribute; skipping.' % (
  1066. name, self.current_host.format_name()))
  1067. return
  1068. - self.current_host.os.append(attrs[u"name"])
  1069. + self.current_host.os.append(attrs["name"])
  1070. def _start_finished(self, name, attrs):
  1071. - assert self.parent_element() == u"runstats"
  1072. + assert self.parent_element() == "runstats"
  1073. if "time" in attrs:
  1074. - end_timestamp = int(attrs.get(u"time"))
  1075. + end_timestamp = int(attrs.get("time"))
  1076. self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp)
  1077. def _end_host(self, name):
  1078. @@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator):
  1079. def frag(self, frag):
  1080. for node in frag.childNodes:
  1081. - node.writexml(self.f, newl=u"\n")
  1082. + node.writexml(self.f, newl="\n")
  1083. def frag_a(self, frag):
  1084. - self.startElement(u"a", {})
  1085. + self.startElement("a", {})
  1086. for node in frag.childNodes:
  1087. - node.writexml(self.f, newl=u"\n")
  1088. - self.endElement(u"a")
  1089. + node.writexml(self.f, newl="\n")
  1090. + self.endElement("a")
  1091. def frag_b(self, frag):
  1092. - self.startElement(u"b", {})
  1093. + self.startElement("b", {})
  1094. for node in frag.childNodes:
  1095. - node.writexml(self.f, newl=u"\n")
  1096. - self.endElement(u"b")
  1097. + node.writexml(self.f, newl="\n")
  1098. + self.endElement("b")
  1099. def usage():
  1100. - print u"""\
  1101. + print("""\
  1102. Usage: %s [option] FILE1 FILE2
  1103. Compare two Nmap XML files and display a list of their differences.
  1104. Differences include host state changes, port state changes, and changes to
  1105. @@ -1451,7 +1448,7 @@ service and OS detection.
  1106. -v, --verbose also show hosts and ports that haven't changed.
  1107. --text display output in text format (default)
  1108. --xml display output in XML format\
  1109. -""" % sys.argv[0]
  1110. +""" % sys.argv[0])
  1111. EXIT_EQUAL = 0
  1112. EXIT_DIFFERENT = 1
  1113. @@ -1459,8 +1456,8 @@ EXIT_ERROR = 2
  1114. def usage_error(msg):
  1115. - print >> sys.stderr, u"%s: %s" % (sys.argv[0], msg)
  1116. - print >> sys.stderr, u"Try '%s -h' for help." % sys.argv[0]
  1117. + print("%s: %s" % (sys.argv[0], msg), file=sys.stderr)
  1118. + print("Try '%s -h' for help." % sys.argv[0], file=sys.stderr)
  1119. sys.exit(EXIT_ERROR)
  1120. @@ -1471,7 +1468,7 @@ def main():
  1121. try:
  1122. opts, input_filenames = getopt.gnu_getopt(
  1123. sys.argv[1:], "hv", ["help", "text", "verbose", "xml"])
  1124. - except getopt.GetoptError, e:
  1125. + except getopt.GetoptError as e:
  1126. usage_error(e.msg)
  1127. for o, a in opts:
  1128. if o == "-h" or o == "--help":
  1129. @@ -1481,15 +1478,15 @@ def main():
  1130. verbose = True
  1131. elif o == "--text":
  1132. if output_format is not None and output_format != "text":
  1133. - usage_error(u"contradictory output format options.")
  1134. + usage_error("contradictory output format options.")
  1135. output_format = "text"
  1136. elif o == "--xml":
  1137. if output_format is not None and output_format != "xml":
  1138. - usage_error(u"contradictory output format options.")
  1139. + usage_error("contradictory output format options.")
  1140. output_format = "xml"
  1141. if len(input_filenames) != 2:
  1142. - usage_error(u"need exactly two input filenames.")
  1143. + usage_error("need exactly two input filenames.")
  1144. if output_format is None:
  1145. output_format = "text"
  1146. @@ -1502,8 +1499,8 @@ def main():
  1147. scan_a.load_from_file(filename_a)
  1148. scan_b = Scan()
  1149. scan_b.load_from_file(filename_b)
  1150. - except IOError, e:
  1151. - print >> sys.stderr, u"Can't open file: %s" % str(e)
  1152. + except IOError as e:
  1153. + print("Can't open file: %s" % str(e), file=sys.stderr)
  1154. sys.exit(EXIT_ERROR)
  1155. if output_format == "text":
  1156. diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py
  1157. index 2fa4ae0..27fc525 100755
  1158. --- a/ndiff/ndifftest.py
  1159. +++ b/ndiff/ndifftest.py
  1160. @@ -1,4 +1,4 @@
  1161. -#!/usr/bin/env python
  1162. +#!/usr/bin/env python3
  1163. # Unit tests for Ndiff.
  1164. @@ -22,7 +22,7 @@ for x in dir(ndiff):
  1165. sys.dont_write_bytecode = dont_write_bytecode
  1166. del dont_write_bytecode
  1167. -import StringIO
  1168. +import io
  1169. class scan_test(unittest.TestCase):
  1170. @@ -52,7 +52,7 @@ class scan_test(unittest.TestCase):
  1171. scan.load_from_file("test-scans/single.xml")
  1172. host = scan.hosts[0]
  1173. self.assertEqual(len(host.ports), 5)
  1174. - self.assertEqual(host.extraports.items(), [("filtered", 95)])
  1175. + self.assertEqual(list(host.extraports.items()), [("filtered", 95)])
  1176. def test_extraports_multi(self):
  1177. """Test that the correct number of known ports is returned when there
  1178. @@ -68,9 +68,9 @@ class scan_test(unittest.TestCase):
  1179. """Test that nmaprun information is recorded."""
  1180. scan = Scan()
  1181. scan.load_from_file("test-scans/empty.xml")
  1182. - self.assertEqual(scan.scanner, u"nmap")
  1183. - self.assertEqual(scan.version, u"4.90RC2")
  1184. - self.assertEqual(scan.args, u"nmap -oX empty.xml -p 1-100")
  1185. + self.assertEqual(scan.scanner, "nmap")
  1186. + self.assertEqual(scan.version, "4.90RC2")
  1187. + self.assertEqual(scan.args, "nmap -oX empty.xml -p 1-100")
  1188. def test_addresses(self):
  1189. """Test that addresses are recorded."""
  1190. @@ -84,7 +84,7 @@ class scan_test(unittest.TestCase):
  1191. scan = Scan()
  1192. scan.load_from_file("test-scans/simple.xml")
  1193. host = scan.hosts[0]
  1194. - self.assertEqual(host.hostnames, [u"scanme.nmap.org"])
  1195. + self.assertEqual(host.hostnames, ["scanme.nmap.org"])
  1196. def test_os(self):
  1197. """Test that OS information is recorded."""
  1198. @@ -99,7 +99,7 @@ class scan_test(unittest.TestCase):
  1199. scan.load_from_file("test-scans/complex.xml")
  1200. host = scan.hosts[0]
  1201. self.assertTrue(len(host.script_results) > 0)
  1202. - self.assertTrue(len(host.ports[(22, u"tcp")].script_results) > 0)
  1203. + self.assertTrue(len(host.ports[(22, "tcp")].script_results) > 0)
  1204. # This test is commented out because Nmap XML doesn't store any information
  1205. # about down hosts, not even the fact that they are down. Recovering the list
  1206. @@ -128,16 +128,16 @@ class host_test(unittest.TestCase):
  1207. def test_format_name(self):
  1208. h = Host()
  1209. - self.assertTrue(isinstance(h.format_name(), basestring))
  1210. - h.add_address(IPv4Address(u"127.0.0.1"))
  1211. - self.assertTrue(u"127.0.0.1" in h.format_name())
  1212. + self.assertTrue(isinstance(h.format_name(), str))
  1213. + h.add_address(IPv4Address("127.0.0.1"))
  1214. + self.assertTrue("127.0.0.1" in h.format_name())
  1215. h.add_address(IPv6Address("::1"))
  1216. - self.assertTrue(u"127.0.0.1" in h.format_name())
  1217. - self.assertTrue(u"::1" in h.format_name())
  1218. - h.add_hostname(u"localhost")
  1219. - self.assertTrue(u"127.0.0.1" in h.format_name())
  1220. - self.assertTrue(u"::1" in h.format_name())
  1221. - self.assertTrue(u"localhost" in h.format_name())
  1222. + self.assertTrue("127.0.0.1" in h.format_name())
  1223. + self.assertTrue("::1" in h.format_name())
  1224. + h.add_hostname("localhost")
  1225. + self.assertTrue("127.0.0.1" in h.format_name())
  1226. + self.assertTrue("::1" in h.format_name())
  1227. + self.assertTrue("localhost" in h.format_name())
  1228. def test_empty_get_port(self):
  1229. h = Host()
  1230. @@ -197,8 +197,8 @@ class host_test(unittest.TestCase):
  1231. h = s.hosts[0]
  1232. self.assertEqual(len(h.ports), 5)
  1233. self.assertEqual(len(h.extraports), 1)
  1234. - self.assertEqual(h.extraports.keys()[0], u"filtered")
  1235. - self.assertEqual(h.extraports.values()[0], 95)
  1236. + self.assertEqual(list(h.extraports.keys())[0], "filtered")
  1237. + self.assertEqual(list(h.extraports.values())[0], 95)
  1238. self.assertEqual(h.state, "up")
  1239. @@ -241,13 +241,13 @@ class port_test(unittest.TestCase):
  1240. """Test the Port class."""
  1241. def test_spec_string(self):
  1242. p = Port((10, "tcp"))
  1243. - self.assertEqual(p.spec_string(), u"10/tcp")
  1244. + self.assertEqual(p.spec_string(), "10/tcp")
  1245. p = Port((100, "ip"))
  1246. - self.assertEqual(p.spec_string(), u"100/ip")
  1247. + self.assertEqual(p.spec_string(), "100/ip")
  1248. def test_state_string(self):
  1249. p = Port((10, "tcp"))
  1250. - self.assertEqual(p.state_string(), u"unknown")
  1251. + self.assertEqual(p.state_string(), "unknown")
  1252. class service_test(unittest.TestCase):
  1253. @@ -255,47 +255,47 @@ class service_test(unittest.TestCase):
  1254. def test_compare(self):
  1255. """Test that services with the same contents compare equal."""
  1256. a = Service()
  1257. - a.name = u"ftp"
  1258. - a.product = u"FooBar FTP"
  1259. - a.version = u"1.1.1"
  1260. - a.tunnel = u"ssl"
  1261. + a.name = "ftp"
  1262. + a.product = "FooBar FTP"
  1263. + a.version = "1.1.1"
  1264. + a.tunnel = "ssl"
  1265. self.assertEqual(a, a)
  1266. b = Service()
  1267. - b.name = u"ftp"
  1268. - b.product = u"FooBar FTP"
  1269. - b.version = u"1.1.1"
  1270. - b.tunnel = u"ssl"
  1271. + b.name = "ftp"
  1272. + b.product = "FooBar FTP"
  1273. + b.version = "1.1.1"
  1274. + b.tunnel = "ssl"
  1275. self.assertEqual(a, b)
  1276. - b.name = u"http"
  1277. + b.name = "http"
  1278. self.assertNotEqual(a, b)
  1279. c = Service()
  1280. self.assertNotEqual(a, c)
  1281. def test_tunnel(self):
  1282. serv = Service()
  1283. - serv.name = u"http"
  1284. - serv.tunnel = u"ssl"
  1285. - self.assertEqual(serv.name_string(), u"ssl/http")
  1286. + serv.name = "http"
  1287. + serv.tunnel = "ssl"
  1288. + self.assertEqual(serv.name_string(), "ssl/http")
  1289. def test_version_string(self):
  1290. serv = Service()
  1291. - serv.product = u"FooBar"
  1292. + serv.product = "FooBar"
  1293. self.assertTrue(len(serv.version_string()) > 0)
  1294. serv = Service()
  1295. - serv.version = u"1.2.3"
  1296. + serv.version = "1.2.3"
  1297. self.assertTrue(len(serv.version_string()) > 0)
  1298. serv = Service()
  1299. - serv.extrainfo = u"misconfigured"
  1300. + serv.extrainfo = "misconfigured"
  1301. self.assertTrue(len(serv.version_string()) > 0)
  1302. serv = Service()
  1303. - serv.product = u"FooBar"
  1304. - serv.version = u"1.2.3"
  1305. + serv.product = "FooBar"
  1306. + serv.version = "1.2.3"
  1307. # Must match Nmap output.
  1308. self.assertEqual(serv.version_string(),
  1309. - u"%s %s" % (serv.product, serv.version))
  1310. - serv.extrainfo = u"misconfigured"
  1311. + "%s %s" % (serv.product, serv.version))
  1312. + serv.extrainfo = "misconfigured"
  1313. self.assertEqual(serv.version_string(),
  1314. - u"%s %s (%s)" % (serv.product, serv.version, serv.extrainfo))
  1315. + "%s %s (%s)" % (serv.product, serv.version, serv.extrainfo))
  1316. class ScanDiffSub(ScanDiff):
  1317. @@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase):
  1318. a.load_from_file("test-scans/empty.xml")
  1319. b = Scan()
  1320. b.load_from_file("test-scans/simple.xml")
  1321. - f = StringIO.StringIO()
  1322. + f = io.StringIO()
  1323. self.scan_diff = ScanDiffXML(a, b, f)
  1324. self.scan_diff.output()
  1325. self.xml = f.getvalue()
  1326. @@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase):
  1327. def test_well_formed(self):
  1328. try:
  1329. document = xml.dom.minidom.parseString(self.xml)
  1330. - except Exception, e:
  1331. - self.fail(u"Parsing XML diff output caused the exception: %s"
  1332. + except Exception as e:
  1333. + self.fail("Parsing XML diff output caused the exception: %s"
  1334. % str(e))
  1335. @@ -739,8 +739,8 @@ def host_apply_diff(host, diff):
  1336. host.os = diff.host_b.os[:]
  1337. if diff.extraports_changed:
  1338. - for state in host.extraports.keys():
  1339. - for port in host.ports.values():
  1340. + for state in list(host.extraports.keys()):
  1341. + for port in list(host.ports.values()):
  1342. if port.state == state:
  1343. del host.ports[port.spec]
  1344. host.extraports = diff.host_b.extraports.copy()
  1345. diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff
  1346. index 8517c07..4671e73 100755
  1347. --- a/ndiff/scripts/ndiff
  1348. +++ b/ndiff/scripts/ndiff
  1349. @@ -1,4 +1,4 @@
  1350. -#!/usr/bin/env python
  1351. +#!/usr/bin/env python3
  1352. # Ndiff
  1353. #
  1354. @@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB):
  1355. try:
  1356. import ndiff
  1357. -except ImportError, e:
  1358. - print >> sys.stderr, """\
  1359. +except ImportError as e:
  1360. + print("""\
  1361. Could not import the ndiff module: %s.
  1362. -I checked in these directories:""" % repr(e.message)
  1363. +I checked in these directories:""" % repr(e), file=sys.stderr)
  1364. for dir in sys.path:
  1365. - print >> sys.stderr, " %s" % dir
  1366. - print >> sys.stderr, """\
  1367. + print(" %s" % dir, file=sys.stderr)
  1368. + print("""\
  1369. If you installed Ndiff in another directory, you may have to add the
  1370. -modules directory to the PYTHONPATH environment variable."""
  1371. +modules directory to the PYTHONPATH environment variable.""", file=sys.stderr)
  1372. sys.exit(1)
  1373. import ndiff
  1374. diff --git a/ndiff/setup.py b/ndiff/setup.py
  1375. old mode 100644
  1376. new mode 100755
  1377. index b5e254c..c49bcf3
  1378. --- a/ndiff/setup.py
  1379. +++ b/ndiff/setup.py
  1380. @@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install):
  1381. self.saved_prefix = sys.prefix
  1382. try:
  1383. distutils.command.install.install.finalize_options(self)
  1384. - except distutils.errors.DistutilsPlatformError, e:
  1385. + except distutils.errors.DistutilsPlatformError as e:
  1386. raise distutils.errors.DistutilsPlatformError(str(e) + """
  1387. Installing your distribution's python-dev package may solve this problem.""")
  1388. @@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""")
  1389. #!/usr/bin/env python
  1390. import errno, os, os.path, sys
  1391. -print 'Uninstall %(name)s'
  1392. +print('Uninstall %(name)s')
  1393. answer = raw_input('Are you sure that you want to uninstall '
  1394. '%(name)s (yes/no) ')
  1395. if answer != 'yes' and answer != 'y':
  1396. - print 'Not uninstalling.'
  1397. + print('Not uninstalling.')
  1398. sys.exit(0)
  1399. """ % {'name': APP_NAME}
  1400. @@ -177,8 +177,8 @@ if answer != 'yes' and answer != 'y':
  1401. # This should never happen (everything gets installed
  1402. # inside the root), but if it does, be safe and don't
  1403. # delete anything.
  1404. - uninstaller += ("print '%s was not installed inside "
  1405. - "the root %s; skipping.'\n" % (output, self.root))
  1406. + uninstaller += ("print('%s was not installed inside "
  1407. + "the root %s; skipping.')\n" % (output, self.root))
  1408. continue
  1409. output = path_strip_prefix(output, self.root)
  1410. assert os.path.isabs(output)
  1411. @@ -202,24 +202,24 @@ for path in INSTALLED_FILES:
  1412. dirs.append(path)
  1413. # Delete the files.
  1414. for file in files:
  1415. - print "Removing '%s'." % file
  1416. + print("Removing '%s'." % file)
  1417. try:
  1418. os.remove(file)
  1419. - except OSError, e:
  1420. - print >> sys.stderr, ' Error: %s.' % str(e)
  1421. + except OSError as e:
  1422. + print(' Error: %s.' % str(e), file=sys.stderr)
  1423. # Delete the directories. First reverse-sort the normalized paths by
  1424. # length so that child directories are deleted before their parents.
  1425. dirs = [os.path.normpath(dir) for dir in dirs]
  1426. dirs.sort(key = len, reverse = True)
  1427. for dir in dirs:
  1428. try:
  1429. - print "Removing the directory '%s'." % dir
  1430. + print("Removing the directory '%s'." % dir)
  1431. os.rmdir(dir)
  1432. - except OSError, e:
  1433. + except OSError as e:
  1434. if e.errno == errno.ENOTEMPTY:
  1435. - print "Directory '%s' not empty; not removing." % dir
  1436. + print("Directory '%s' not empty; not removing." % dir)
  1437. else:
  1438. - print >> sys.stderr, str(e)
  1439. + print(str(e), file=sys.stderr)
  1440. """
  1441. uninstaller_file = open(uninstaller_filename, 'w')
  1442. @@ -227,7 +227,7 @@ for dir in dirs:
  1443. uninstaller_file.close()
  1444. # Set exec bit for uninstaller
  1445. - mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777
  1446. + mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0o555) & 0o7777
  1447. os.chmod(uninstaller_filename, mode)
  1448. def write_installed_files(self):
  1449. @@ -242,7 +242,7 @@ for dir in dirs:
  1450. try:
  1451. for output in self.get_installed_files():
  1452. assert "\n" not in output
  1453. - print >> f, output
  1454. + print(output, file=f)
  1455. finally:
  1456. f.close()
  1457. @@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command):
  1458. # Read the list of installed files.
  1459. try:
  1460. f = open(INSTALLED_FILES_NAME, "r")
  1461. - except IOError, e:
  1462. + except IOError as e:
  1463. if e.errno == errno.ENOENT:
  1464. log.error("Couldn't open the installation record '%s'. "
  1465. "Have you installed yet?" % INSTALLED_FILES_NAME)
  1466. @@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command):
  1467. try:
  1468. if not self.dry_run:
  1469. os.remove(file)
  1470. - except OSError, e:
  1471. + except OSError as e:
  1472. log.error(str(e))
  1473. # Delete the directories. First reverse-sort the normalized paths by
  1474. # length so that child directories are deleted before their parents.
  1475. @@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command):
  1476. log.info("Removing the directory '%s'." % dir)
  1477. if not self.dry_run:
  1478. os.rmdir(dir)
  1479. - except OSError, e:
  1480. + except OSError as e:
  1481. if e.errno == errno.ENOTEMPTY:
  1482. log.info("Directory '%s' not empty; not removing." % dir)
  1483. else:
  1484. diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py
  1485. index 9ba612a..fd251fe 100755
  1486. --- a/ndiff/test-scans/anonymize.py
  1487. +++ b/ndiff/test-scans/anonymize.py
  1488. @@ -1,4 +1,4 @@
  1489. -#!/usr/bin/env python
  1490. +#!/usr/bin/env python3
  1491. # Anonymize an Nmap XML file, replacing host name and IP addresses with random
  1492. # anonymous ones. Anonymized names will be consistent between runs of the
  1493. @@ -20,20 +20,20 @@ r = random.Random()
  1494. def hash(s):
  1495. - digest = hashlib.sha512(s).hexdigest()
  1496. + digest = hashlib.sha512(s.encode()).hexdigest()
  1497. return int(digest, 16)
  1498. def anonymize_mac_address(addr):
  1499. r.seed(hash(addr))
  1500. nums = (0, 0, 0) + tuple(r.randrange(256) for i in range(3))
  1501. - return u":".join(u"%02X" % x for x in nums)
  1502. + return ":".join("%02X" % x for x in nums)
  1503. def anonymize_ipv4_address(addr):
  1504. r.seed(hash(addr))
  1505. nums = (10,) + tuple(r.randrange(256) for i in range(3))
  1506. - return u".".join(unicode(x) for x in nums)
  1507. + return ".".join(str(x) for x in nums)
  1508. def anonymize_ipv6_address(addr):
  1509. @@ -41,7 +41,7 @@ def anonymize_ipv6_address(addr):
  1510. # RFC 4193.
  1511. nums = (0xFD00 + r.randrange(256),)
  1512. nums = nums + tuple(r.randrange(65536) for i in range(7))
  1513. - return u":".join("%04X" % x for x in nums)
  1514. + return ":".join("%04X" % x for x in nums)
  1515. # Maps to memoize address and host name conversions.
  1516. hostname_map = {}
  1517. @@ -54,11 +54,11 @@ def anonymize_hostname(name):
  1518. LETTERS = "acbdefghijklmnopqrstuvwxyz"
  1519. r.seed(hash(name))
  1520. length = r.randrange(5, 10)
  1521. - prefix = u"".join(r.sample(LETTERS, length))
  1522. + prefix = "".join(r.sample(LETTERS, length))
  1523. num = r.randrange(1000)
  1524. - hostname_map[name] = u"%s-%d.example.com" % (prefix, num)
  1525. + hostname_map[name] = "%s-%d.example.com" % (prefix, num)
  1526. if VERBOSE:
  1527. - print >> sys.stderr, "Replace %s with %s" % (name, hostname_map[name])
  1528. + print("Replace %s with %s" % (name, hostname_map[name]), file=sys.stderr)
  1529. return hostname_map[name]
  1530. mac_re = re.compile(r'\b([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}\b')
  1531. @@ -78,7 +78,7 @@ def anonymize_address(addr):
  1532. else:
  1533. assert False
  1534. if VERBOSE:
  1535. - print >> sys.stderr, "Replace %s with %s" % (addr, address_map[addr])
  1536. + print("Replace %s with %s" % (addr, address_map[addr]), file=sys.stderr)
  1537. return address_map[addr]
  1538. --
  1539. 2.24.1