kopia lustrzana https://github.com/ctjacobs/pyqso
Use " not ' for strings.
Christian T. Jacobs
rodzic
660d993bc1
commit
c777c924bb
|
|
@ -209,7 +209,7 @@ class ADIF:
|
|||
logging.debug("Reading in ADIF file with path: %s..." % path)
|
||||
|
||||
text = ""
|
||||
with open(path, mode='r', errors="replace") as f:
|
||||
with open(path, mode="r", errors="replace") as f:
|
||||
text = f.read()
|
||||
|
||||
records = self.parse_adi(text)
|
||||
|
|
@ -234,7 +234,7 @@ class ADIF:
|
|||
|
||||
# ADIF-related configuration options
|
||||
config = configparser.ConfigParser()
|
||||
have_config = (config.read(expanduser('~/.config/pyqso/preferences.ini')) != [])
|
||||
have_config = (config.read(expanduser("~/.config/pyqso/preferences.ini")) != [])
|
||||
(section, option) = ("adif", "merge_comment")
|
||||
if(have_config and config.has_option(section, option) and config.get(section, option) == "True"):
|
||||
merge_comment = True
|
||||
|
|
@ -242,12 +242,12 @@ class ADIF:
|
|||
merge_comment = False
|
||||
|
||||
# Separate the text at the <eor> or <eoh> markers.
|
||||
tokens = re.split('(<eor>|<eoh>)', text, flags=re.IGNORECASE)
|
||||
tokens = re.split("(<eor>|<eoh>)", text, flags=re.IGNORECASE)
|
||||
tokens.pop() # Anything after the final <eor> marker should be ignored.
|
||||
|
||||
# The header might tell us the number of records, but let's not assume
|
||||
# this and simply ignore it instead (if it exists).
|
||||
if(re.search('<eoh>', text, flags=re.IGNORECASE) is not None):
|
||||
if(re.search("<eoh>", text, flags=re.IGNORECASE) is not None):
|
||||
# There is a header present, so let's ignore everything
|
||||
# up to and including the <eoh> marker. Note that
|
||||
# re.search has been used here to handle any case sensitivity.
|
||||
|
|
@ -255,16 +255,16 @@ class ADIF:
|
|||
# but wasn't being detected before.
|
||||
while len(tokens) > 0:
|
||||
t = tokens.pop(0)
|
||||
if(re.match('<eoh>', t, flags=re.IGNORECASE) is not None):
|
||||
if(re.match("<eoh>", t, flags=re.IGNORECASE) is not None):
|
||||
break
|
||||
|
||||
n_eor = 0
|
||||
n_record = 0
|
||||
records = []
|
||||
pattern = re.compile('<(.*?):(\d*).*?>([^<\t\n\r\f\v]+)')
|
||||
pattern = re.compile("<(.*?):(\d*).*?>([^<\t\n\r\f\v]+)")
|
||||
|
||||
for t in tokens:
|
||||
if(re.match('<eor>', t, flags=re.IGNORECASE) is not None):
|
||||
if(re.match("<eor>", t, flags=re.IGNORECASE) is not None):
|
||||
n_eor += 1
|
||||
continue
|
||||
else:
|
||||
|
|
@ -330,7 +330,7 @@ class ADIF:
|
|||
|
||||
logging.debug("Writing records to an ADIF file...")
|
||||
|
||||
with open(path, mode='w', errors="replace") as f: # Open file for writing
|
||||
with open(path, mode="w", errors="replace") as f: # Open file for writing
|
||||
|
||||
# First write a header containing program version, number of records, etc.
|
||||
dt = datetime.now()
|
||||
|
|
|
|||
|
|
@ -51,17 +51,17 @@ class CallsignLookupQRZ:
|
|||
"""
|
||||
logging.debug("Connecting to the qrz.com server...")
|
||||
try:
|
||||
self.connection = http_client.HTTPConnection('xmldata.qrz.com')
|
||||
request = '/xml/current/?username=%s;password=%s;agent=pyqso' % (username, password)
|
||||
self.connection.request('GET', request)
|
||||
self.connection = http_client.HTTPConnection("xmldata.qrz.com")
|
||||
request = "/xml/current/?username=%s;password=%s;agent=pyqso" % (username, password)
|
||||
self.connection.request("GET", request)
|
||||
response = self.connection.getresponse()
|
||||
except:
|
||||
error(parent=self.parent, message="Could not connect to the qrz.com server. Check connection to the internets?")
|
||||
return False
|
||||
|
||||
xml_data = minidom.parseString(response.read())
|
||||
session_node = xml_data.getElementsByTagName('Session')[0] # There should only be one Session element
|
||||
session_key_node = session_node.getElementsByTagName('Key')
|
||||
session_node = xml_data.getElementsByTagName("Session")[0] # There should only be one Session element
|
||||
session_key_node = session_node.getElementsByTagName("Key")
|
||||
if(len(session_key_node) > 0):
|
||||
self.session_key = session_key_node[0].firstChild.nodeValue
|
||||
logging.debug("Successfully connected to the qrz.com server...")
|
||||
|
|
@ -70,7 +70,7 @@ class CallsignLookupQRZ:
|
|||
connected = False
|
||||
|
||||
# If there are any errors or warnings, print them out
|
||||
session_error_node = session_node.getElementsByTagName('Error')
|
||||
session_error_node = session_node.getElementsByTagName("Error")
|
||||
if(len(session_error_node) > 0):
|
||||
session_error = session_error_node[0].firstChild.nodeValue
|
||||
error(parent=self.parent, message="qrz.com session error: "+session_error)
|
||||
|
|
@ -97,57 +97,57 @@ class CallsignLookupQRZ:
|
|||
# Commence lookup.
|
||||
fields_and_data = {"NAME": "", "ADDRESS": "", "STATE": "", "COUNTRY": "", "DXCC": "", "CQZ": "", "ITUZ": "", "IOTA": ""}
|
||||
if(self.session_key):
|
||||
request = '/xml/current/?s=%s;callsign=%s' % (self.session_key, callsign)
|
||||
self.connection.request('GET', request)
|
||||
request = "/xml/current/?s=%s;callsign=%s" % (self.session_key, callsign)
|
||||
self.connection.request("GET", request)
|
||||
response = self.connection.getresponse()
|
||||
|
||||
xml_data = minidom.parseString(response.read())
|
||||
callsign_node = xml_data.getElementsByTagName('Callsign')
|
||||
callsign_node = xml_data.getElementsByTagName("Callsign")
|
||||
if(len(callsign_node) > 0):
|
||||
callsign_node = callsign_node[0] # There should only be a maximum of one Callsign element
|
||||
|
||||
callsign_fname_node = callsign_node.getElementsByTagName('fname')
|
||||
callsign_name_node = callsign_node.getElementsByTagName('name')
|
||||
callsign_fname_node = callsign_node.getElementsByTagName("fname")
|
||||
callsign_name_node = callsign_node.getElementsByTagName("name")
|
||||
if(len(callsign_fname_node) > 0):
|
||||
fields_and_data["NAME"] = callsign_fname_node[0].firstChild.nodeValue
|
||||
if(len(callsign_name_node) > 0): # Add the surname, if present
|
||||
fields_and_data["NAME"] = fields_and_data["NAME"] + " " + callsign_name_node[0].firstChild.nodeValue
|
||||
|
||||
callsign_addr1_node = callsign_node.getElementsByTagName('addr1')
|
||||
callsign_addr2_node = callsign_node.getElementsByTagName('addr2')
|
||||
callsign_addr1_node = callsign_node.getElementsByTagName("addr1")
|
||||
callsign_addr2_node = callsign_node.getElementsByTagName("addr2")
|
||||
if(len(callsign_addr1_node) > 0):
|
||||
fields_and_data["ADDRESS"] = callsign_addr1_node[0].firstChild.nodeValue
|
||||
if(len(callsign_addr2_node) > 0): # Add the second line of the address, if present
|
||||
fields_and_data["ADDRESS"] = (fields_and_data["ADDRESS"] + ", " if len(callsign_addr1_node) > 0 else "") + callsign_addr2_node[0].firstChild.nodeValue
|
||||
|
||||
callsign_state_node = callsign_node.getElementsByTagName('state')
|
||||
callsign_state_node = callsign_node.getElementsByTagName("state")
|
||||
if(len(callsign_state_node) > 0):
|
||||
fields_and_data["STATE"] = callsign_state_node[0].firstChild.nodeValue
|
||||
|
||||
callsign_country_node = callsign_node.getElementsByTagName('country')
|
||||
callsign_country_node = callsign_node.getElementsByTagName("country")
|
||||
if(len(callsign_country_node) > 0):
|
||||
fields_and_data["COUNTRY"] = callsign_country_node[0].firstChild.nodeValue
|
||||
|
||||
callsign_ccode_node = callsign_node.getElementsByTagName('ccode')
|
||||
callsign_ccode_node = callsign_node.getElementsByTagName("ccode")
|
||||
if(len(callsign_ccode_node) > 0):
|
||||
fields_and_data["DXCC"] = callsign_ccode_node[0].firstChild.nodeValue
|
||||
|
||||
callsign_cqzone_node = callsign_node.getElementsByTagName('cqzone')
|
||||
callsign_cqzone_node = callsign_node.getElementsByTagName("cqzone")
|
||||
if(len(callsign_cqzone_node) > 0):
|
||||
fields_and_data["CQZ"] = callsign_cqzone_node[0].firstChild.nodeValue
|
||||
|
||||
callsign_ituzone_node = callsign_node.getElementsByTagName('ituzone')
|
||||
callsign_ituzone_node = callsign_node.getElementsByTagName("ituzone")
|
||||
if(len(callsign_ituzone_node) > 0):
|
||||
fields_and_data["ITUZ"] = callsign_ituzone_node[0].firstChild.nodeValue
|
||||
|
||||
callsign_iota_node = callsign_node.getElementsByTagName('iota')
|
||||
callsign_iota_node = callsign_node.getElementsByTagName("iota")
|
||||
if(len(callsign_iota_node) > 0):
|
||||
fields_and_data["IOTA"] = callsign_iota_node[0].firstChild.nodeValue
|
||||
else:
|
||||
# If there is no Callsign element, then print out the error message in the Session element
|
||||
session_node = xml_data.getElementsByTagName('Session')
|
||||
session_node = xml_data.getElementsByTagName("Session")
|
||||
if(len(session_node) > 0):
|
||||
session_error_node = session_node[0].getElementsByTagName('Error')
|
||||
session_error_node = session_node[0].getElementsByTagName("Error")
|
||||
if(len(session_error_node) > 0):
|
||||
session_error = session_error_node[0].firstChild.nodeValue
|
||||
error(parent=self.parent, message=session_error)
|
||||
|
|
@ -177,17 +177,17 @@ class CallsignLookupHamQTH:
|
|||
|
||||
logging.debug("Connecting to the hamqth.com server...")
|
||||
try:
|
||||
self.connection = http_client.HTTPConnection('www.hamqth.com')
|
||||
request = '/xml.php?u=%s&p=%s' % (username, password)
|
||||
self.connection.request('GET', request)
|
||||
self.connection = http_client.HTTPSConnection("www.hamqth.com")
|
||||
request = "/xml.php?u=%s&p=%s" % (username, password)
|
||||
self.connection.request("GET", request)
|
||||
response = self.connection.getresponse()
|
||||
except:
|
||||
error(parent=self.parent, message="Could not connect to the hamqth.com server. Check connection to the internets?")
|
||||
return False
|
||||
|
||||
xml_data = minidom.parseString(response.read())
|
||||
session_node = xml_data.getElementsByTagName('session')[0] # There should only be one Session element
|
||||
session_id_node = session_node.getElementsByTagName('session_id')
|
||||
session_node = xml_data.getElementsByTagName("session")[0] # There should only be one Session element
|
||||
session_id_node = session_node.getElementsByTagName("session_id")
|
||||
if(len(session_id_node) > 0):
|
||||
self.session_id = session_id_node[0].firstChild.nodeValue
|
||||
logging.debug("Successfully connected to the hamqth.com server...")
|
||||
|
|
@ -196,7 +196,7 @@ class CallsignLookupHamQTH:
|
|||
connected = False
|
||||
|
||||
# If there are any errors or warnings, print them out
|
||||
session_error_node = session_node.getElementsByTagName('error')
|
||||
session_error_node = session_node.getElementsByTagName("error")
|
||||
if(len(session_error_node) > 0):
|
||||
session_error = session_error_node[0].firstChild.nodeValue
|
||||
error(parent=self.parent, message="hamqth.com session error: "+session_error)
|
||||
|
|
@ -223,50 +223,50 @@ class CallsignLookupHamQTH:
|
|||
# Commence lookup.
|
||||
fields_and_data = {"NAME": "", "ADDRESS": "", "STATE": "", "COUNTRY": "", "DXCC": "", "CQZ": "", "ITUZ": "", "IOTA": ""}
|
||||
if(self.session_id):
|
||||
request = '/xml.php?id=%s&callsign=%s&prg=pyqso' % (self.session_id, callsign)
|
||||
self.connection.request('GET', request)
|
||||
request = "/xml.php?id=%s&callsign=%s&prg=pyqso" % (self.session_id, callsign)
|
||||
self.connection.request("GET", request)
|
||||
response = self.connection.getresponse()
|
||||
|
||||
xml_data = minidom.parseString(response.read())
|
||||
search_node = xml_data.getElementsByTagName('search')
|
||||
search_node = xml_data.getElementsByTagName("search")
|
||||
if(len(search_node) > 0):
|
||||
search_node = search_node[0] # There should only be a maximum of one Callsign element
|
||||
|
||||
search_name_node = search_node.getElementsByTagName('nick')
|
||||
search_name_node = search_node.getElementsByTagName("nick")
|
||||
if(len(search_name_node) > 0):
|
||||
fields_and_data["NAME"] = search_name_node[0].firstChild.nodeValue
|
||||
|
||||
search_addr1_node = search_node.getElementsByTagName('adr_street1')
|
||||
search_addr2_node = search_node.getElementsByTagName('adr_street2')
|
||||
search_addr1_node = search_node.getElementsByTagName("adr_street1")
|
||||
search_addr2_node = search_node.getElementsByTagName("adr_street2")
|
||||
if(len(search_addr1_node) > 0):
|
||||
fields_and_data["ADDRESS"] = search_addr1_node[0].firstChild.nodeValue
|
||||
if(len(search_addr2_node) > 0): # Add the second line of the address, if present
|
||||
fields_and_data["ADDRESS"] = (fields_and_data["ADDRESS"] + ", " if len(search_addr1_node) > 0 else "") + search_addr2_node[0].firstChild.nodeValue
|
||||
|
||||
search_state_node = search_node.getElementsByTagName('us_state')
|
||||
search_state_node = search_node.getElementsByTagName("us_state")
|
||||
if(len(search_state_node) > 0):
|
||||
fields_and_data["STATE"] = search_state_node[0].firstChild.nodeValue
|
||||
|
||||
search_country_node = search_node.getElementsByTagName('country')
|
||||
search_country_node = search_node.getElementsByTagName("country")
|
||||
if(len(search_country_node) > 0):
|
||||
fields_and_data["COUNTRY"] = search_country_node[0].firstChild.nodeValue
|
||||
|
||||
search_cqzone_node = search_node.getElementsByTagName('cq')
|
||||
search_cqzone_node = search_node.getElementsByTagName("cq")
|
||||
if(len(search_cqzone_node) > 0):
|
||||
fields_and_data["CQZ"] = search_cqzone_node[0].firstChild.nodeValue
|
||||
|
||||
search_ituzone_node = search_node.getElementsByTagName('itu')
|
||||
search_ituzone_node = search_node.getElementsByTagName("itu")
|
||||
if(len(search_ituzone_node) > 0):
|
||||
fields_and_data["ITUZ"] = search_ituzone_node[0].firstChild.nodeValue
|
||||
|
||||
search_iota_node = search_node.getElementsByTagName('grid')
|
||||
search_iota_node = search_node.getElementsByTagName("grid")
|
||||
if(len(search_iota_node) > 0):
|
||||
fields_and_data["IOTA"] = search_iota_node[0].firstChild.nodeValue
|
||||
else:
|
||||
# If there is no Callsign element, then print out the error message in the Session element
|
||||
session_node = xml_data.getElementsByTagName('session')
|
||||
session_node = xml_data.getElementsByTagName("session")
|
||||
if(len(session_node) > 0):
|
||||
session_error_node = session_node[0].getElementsByTagName('error')
|
||||
session_error_node = session_node[0].getElementsByTagName("error")
|
||||
if(len(session_error_node) > 0):
|
||||
session_error = session_error_node[0].firstChild.nodeValue
|
||||
error(parent=self.parent, message=session_error)
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue