mirror
/
python-hamtools
kopia lustrzana https://github.com/n1ywb/python-hamtools
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

fix logging

master
Jeff Laughlin 2016-09-27 07:17:52 -04:00
rodzic d22e31a26e
commit 68065a2620
1 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
hamtools/geolog.py
Wyświetl plik

@ -60,6 +60,7 @@ class QrzReferencer(object):
def __init__(self, session): def __init__(self, session):
self.session = session self.session = session
## TODO memoize and cache
def reference(self, callsign): def reference(self, callsign):
"""Returns lon, lat from QRZ""" """Returns lon, lat from QRZ"""
try: try:
@ -84,7 +85,7 @@ class CtyDatReferencer(object):
try: try:
dxcc = self.ctydat.getdxcc(callsign) dxcc = self.ctydat.getdxcc(callsign)
except (InvalidDxcc, InvalidCallsign): except (InvalidDxcc, InvalidCallsign):
raise GeoRefError() raise GeoRefError(callsign)
lat = float(dxcc['lat']) lat = float(dxcc['lat'])
lon = float(dxcc['lon']) * -1 lon = float(dxcc['lon']) * -1
return lon, lat return lon, lat
@ -135,7 +136,7 @@ class Log(object):
try: try:
return d.reference(callsign) return d.reference(callsign)
except GeoRefError, e: except GeoRefError, e:
log.warning("%r failed" % d, exc_info=True) log.warning("%r failed on call %s", d, callsign)
else: else:
raise GeoRefFail(callsign) raise GeoRefFail(callsign)
@ -156,7 +157,7 @@ class Log(object):
try: try:
qso['lon'], qso['lat'] = self._georef(qso['call']) qso['lon'], qso['lat'] = self._georef(qso['call'])
except GeoRefFail: except GeoRefFail:
log.warning("Failed to georef call", qso['call']) log.warning("Failed to georef call %s", qso['call'])
def geojson_dumps(self, *args, **kwargs): def geojson_dumps(self, *args, **kwargs):
pointsFC, linesFC = self.geojson() pointsFC, linesFC = self.geojson()