2to3port #2

Merged
benjamyn merged 12 commits from 2to3port into master 2020-10-10 18:48:33 -04:00
2 changed files with 7 additions and 7 deletions
Showing only changes of commit 068743545b - Show all commits

View File

@ -5,7 +5,7 @@ from setuptools import setup, find_packages
import sys, os import sys, os
__version__ = '0.1' __version__ = '0.2'
setup(name='whois', setup(name='whois',
version=__version__, version=__version__,

View File

@ -12,9 +12,9 @@ import socket
import re import re
import logging import logging
import urllib import urllib
import urllib2 #import urllib2
import error #import errormyhost
import flags import flags
class Whois(object): class Whois(object):
@ -61,13 +61,13 @@ class Whois(object):
if self.settings.get("http-method").lower() == "post": if self.settings.get("http-method").lower() == "post":
logging.debug("sendHTTPQuery: Connecting to whois server using POST") logging.debug("sendHTTPQuery: Connecting to whois server using POST")
req = urllib2.Request(whoisServer, param) req = urllib.Request(whoisServer, param)
else: # GET else: # GET
logging.debug("sendHTTPQuery: Connecting to whois server using GET") logging.debug("sendHTTPQuery: Connecting to whois server using GET")
req = urllib2.Request((whoisServer.endswith("?") and whoisServer or whoisServer+"?") + param) req = urllib.Request((whoisServer.endswith("?") and whoisServer or whoisServer+"?") + param)
data = urllib2.urlopen(req).read() data = urllib.urlopen(req).read()
print data print(data)
return data return data