diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle index 885df92..ed57e1b 100644 Binary files a/docs/build/doctrees/environment.pickle and b/docs/build/doctrees/environment.pickle differ diff --git a/docs/build/doctrees/help.doctree b/docs/build/doctrees/help.doctree index 37f96be..e2f62dd 100644 Binary files a/docs/build/doctrees/help.doctree and b/docs/build/doctrees/help.doctree differ diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree index 768832e..6bd28f3 100644 Binary files a/docs/build/doctrees/index.doctree and b/docs/build/doctrees/index.doctree differ diff --git a/docs/build/doctrees/license.doctree b/docs/build/doctrees/license.doctree index b8dfed6..50a4e9c 100644 Binary files a/docs/build/doctrees/license.doctree and b/docs/build/doctrees/license.doctree differ diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo index 8df1402..7a71a0b 100644 --- a/docs/build/html/.buildinfo +++ b/docs/build/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 28550054b902e31426622d239c737bb6 +config: 7a49ae1f4a901a2bfa6bcbedb16df815 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html index 4d6cfab..1042a07 100644 --- a/docs/build/html/genindex.html +++ b/docs/build/html/genindex.html @@ -7,7 +7,7 @@ - Index — pyhamtools 0.4.1 documentation + Index — pyhamtools 0.4.2 documentation @@ -15,7 +15,7 @@ - +
@@ -36,7 +36,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • @@ -61,33 +61,33 @@ @@ -102,7 +102,7 @@
    -
    (in module pyhamtools.utils), [1], [2] +
    (in module pyhamtools.utils)
    @@ -113,37 +113,45 @@
    -
    calculate_distance() (in module pyhamtools.locator), [1] +
    calculate_distance() (in module pyhamtools.locator)
    -
    calculate_distance_longpath() (in module pyhamtools.locator), [1] +
    calculate_distance_longpath() (in module pyhamtools.locator)
    -
    calculate_heading() (in module pyhamtools.locator), [1] +
    calculate_heading() (in module pyhamtools.locator)
    -
    calculate_heading_longpath() (in module pyhamtools.locator), [1] +
    calculate_heading_longpath() (in module pyhamtools.locator)
    -
    calculate_sunrise_sunset() (in module pyhamtools.locator), [1] +
    calculate_sunrise_sunset() (in module pyhamtools.locator)
    -
    Callinfo (class in pyhamtools.callinfo), [1] +
    Callinfo (class in pyhamtools.callinfo)
    -
    copy_data_in_redis() (pyhamtools.lookuplib.LookupLib method), [1] +
    copy_data_in_redis() (pyhamtools.lookuplib.LookupLib method)
    @@ -153,13 +161,13 @@
    -
    get_adif_id() (pyhamtools.callinfo.Callinfo method), [1] +
    get_adif_id() (pyhamtools.callinfo.Callinfo method)
    -
    get_all() (pyhamtools.callinfo.Callinfo method), [1] +
    get_all() (pyhamtools.callinfo.Callinfo method)
    -
    get_continent() (pyhamtools.callinfo.Callinfo method), [1] +
    get_continent() (pyhamtools.callinfo.Callinfo method)
    -
    get_country_name() (pyhamtools.callinfo.Callinfo method), [1] +
    get_country_name() (pyhamtools.callinfo.Callinfo method) +
    + + +
    get_cqz() (pyhamtools.callinfo.Callinfo method)
    -
    get_cqz() (pyhamtools.callinfo.Callinfo method), [1] +
    get_eqsl_users() (in module pyhamtools.qsl)
    -
    get_homecall() (pyhamtools.callinfo.Callinfo static method), [1] +
    get_homecall() (pyhamtools.callinfo.Callinfo static method)
    -
    get_ituz() (pyhamtools.callinfo.Callinfo method), [1] +
    get_ituz() (pyhamtools.callinfo.Callinfo method)
    -
    get_lat_long() (pyhamtools.callinfo.Callinfo method), [1] +
    get_lat_long() (pyhamtools.callinfo.Callinfo method) +
    + + +
    get_lotw_users() (in module pyhamtools.qsl)
    @@ -169,33 +177,33 @@
    -
    is_invalid_operation() (pyhamtools.lookuplib.LookupLib method), [1] +
    is_invalid_operation() (pyhamtools.lookuplib.LookupLib method)
    -
    is_valid_callsign() (pyhamtools.callinfo.Callinfo method), [1] +
    is_valid_callsign() (pyhamtools.callinfo.Callinfo method)
    @@ -205,7 +213,7 @@
    -
    latlong_to_locator() (in module pyhamtools.locator), [1] +
    latlong_to_locator() (in module pyhamtools.locator)
    -
    locator_to_latlong() (in module pyhamtools.locator), [1] +
    locator_to_latlong() (in module pyhamtools.locator)
    -
    lookup_callsign() (pyhamtools.lookuplib.LookupLib method), [1] +
    lookup_callsign() (pyhamtools.lookuplib.LookupLib method)
    -
    lookup_entity() (pyhamtools.lookuplib.LookupLib method), [1] +
    lookup_entity() (pyhamtools.lookuplib.LookupLib method)
    -
    lookup_prefix() (pyhamtools.lookuplib.LookupLib method), [1] +
    lookup_prefix() (pyhamtools.lookuplib.LookupLib method)
    -
    lookup_zone_exception() (pyhamtools.lookuplib.LookupLib method), [1] +
    lookup_zone_exception() (pyhamtools.lookuplib.LookupLib method)
    -
    LookupLib (class in pyhamtools.lookuplib), [1] +
    LookupLib (class in pyhamtools.lookuplib)
    @@ -265,7 +277,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • diff --git a/docs/build/html/help.html b/docs/build/html/help.html index fe21f36..864cb83 100644 --- a/docs/build/html/help.html +++ b/docs/build/html/help.html @@ -6,7 +6,7 @@ - help — pyhamtools 0.4.1 documentation + help — pyhamtools 0.4.2 documentation @@ -14,7 +14,7 @@ - +
    @@ -35,7 +35,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • @@ -86,7 +86,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • diff --git a/docs/build/html/index.html b/docs/build/html/index.html index f52653d..42bb481 100644 --- a/docs/build/html/index.html +++ b/docs/build/html/index.html @@ -6,7 +6,7 @@ - PyHamTools — pyhamtools 0.4.1 documentation + PyHamTools — pyhamtools 0.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -39,7 +39,7 @@
  • next |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • @@ -54,11 +54,11 @@ - + - + @@ -85,6 +85,7 @@ with some modules and classes which are frequently needed:

    diff --git a/docs/build/html/license.html b/docs/build/html/license.html index 14a2fe1..e5318ce 100644 --- a/docs/build/html/license.html +++ b/docs/build/html/license.html @@ -6,7 +6,7 @@ - license — pyhamtools 0.4.1 documentation + license — pyhamtools 0.4.2 documentation @@ -14,7 +14,7 @@ - +
    @@ -35,7 +35,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • @@ -112,7 +112,7 @@ SOFTWARE.

  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • diff --git a/docs/build/html/objects.inv b/docs/build/html/objects.inv index 289430d..cc20be9 100644 Binary files a/docs/build/html/objects.inv and b/docs/build/html/objects.inv differ diff --git a/docs/build/html/py-modindex.html b/docs/build/html/py-modindex.html index 25995c7..6540f5f 100644 --- a/docs/build/html/py-modindex.html +++ b/docs/build/html/py-modindex.html @@ -6,7 +6,7 @@ - Python Module Index — pyhamtools 0.4.1 documentation + Python Module Index — pyhamtools 0.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -38,7 +38,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • @@ -87,7 +87,12 @@ + + +
    -
    pyhamtools.callinfo (module), [1] +
    pyhamtools.callinfo (module)
    @@ -213,17 +221,21 @@ -
    pyhamtools.locator (module), [1], [2] +
    pyhamtools.locator (module), [1]
    -
    pyhamtools.lookuplib (module), [1] +
    pyhamtools.lookuplib (module)
    -
    pyhamtools.utils (module), [1], [2] +
    pyhamtools.qsl (module), [1] +
    + + +
    pyhamtools.utils (module)
    Version:0.4.1
    Version:0.4.2
    Code:https://github.com/dh1tw/pyhamtools
    License:MIT; see LICENSE file
    License:MIT; see license file
    Issues:https://github.com/dh1tw/pyhamtools/issues
        - pyhamtools.utils + pyhamtools.qsl +
        + pyhamtools.utils
    @@ -123,7 +128,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • diff --git a/docs/build/html/search.html b/docs/build/html/search.html index 4d8383f..67cbdf1 100644 --- a/docs/build/html/search.html +++ b/docs/build/html/search.html @@ -6,7 +6,7 @@ - Search — pyhamtools 0.4.1 documentation + Search — pyhamtools 0.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -43,7 +43,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • @@ -94,7 +94,7 @@
  • modules |
    • -
  • pyhamtools 0.4.1 documentation »
    • +
  • pyhamtools 0.4.2 documentation »
    • diff --git a/docs/build/html/searchindex.js b/docs/build/html/searchindex.js index 2c00e05..e808d6b 100644 --- a/docs/build/html/searchindex.js +++ b/docs/build/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({envversion:42,terms:{all:[10,9,3,1],code:[0,9,10,3],illustr:[],queri:[10,8,3],"9h3a":4,month:[6,10,8,3],prefix:[9,10,3],follow:[6,10,9,3,1],lookup:[0,10,9,8,3],typeerror:[6,3],depend:[9,10,3],zone:9,tobia:1,aris:1,merchant:1,digit:3,sourc:[10,3],string:[6,9,10,3],fals:[9,10,3],shortpath:[],util:[],veri:[9,3],"try":[10,3],item:[9,3],quick:8,radio:[0,9,10,3],readthedoc:0,get_cqz:[9,3],impli:1,consequ:[9,3],second:[6,3],download:[10,8,3],even:[10,3],index:0,lookup_prefix:[10,3],neg:[6,3],section:8,calcul:4,asia:[9,3],current:[9,3],delet:[10,3],version:0,method:[10,3],iaru:[0,5,7,3],calculate_dist:[6,8,3],let:[10,3],path:[6,3],modifi:1,valu:[6,10,3],search:0,convers:0,anymor:[5,7,3],cty:[10,3],precis:[9,3],datetim:[6,10,9,8,3],doctest:[],permit:1,action:1,extrem:[10,3],typic:[10,3],dh1tw:[0,1,2,3,8,9],freq_to_band:[5,7,3,4],vp5:[],modul:[],africa:[9,3],filenam:[10,3],api:[9,10,3],instal:[10,3],redi:[10,3],callinfo:[],fed:[10,9,8,3],from:[1,3,6,8,9,10],usb:3,would:[9,3],memori:[10,3],sake:8,two:[],next:[6,8,3],connector:[10,3],qf67bf:[6,8,3],call:[6,9,3,4],is_valid_callsign:[9,3],dxcluster:0,type:[6,9,10,3],more:[10,3],capit:[9,3],notic:[5,7,3,1],files_:[],particular:1,known:[10,3],herebi:1,none:[9,10,3],retriev:[9,3],clublog_:[],work:[9,8,3],can:[10,9,8,3],purpos:[9,3,1],deg:[6,3],claim:1,give:[6,8,3],process:[10,3],calc_dat:[6,3],"14z":8,calculate_distance_longpath:[6,3],onlin:[10,3],plist:[10,3],mylookuplib:[10,3],secur:[],get_country_nam:[9,3],how:[10,8,3],instead:[10,3],updat:[10,3],product:0,ad1c:[0,8],befor:[10,3],wrong:[6,3],adif:[10,9,8,3],date:[6,10,3],"3d2ri":[10,3],associ:1,github:0,author:1,correspond:[6,3],gethomecal:[],issu:0,inform:[10,9,8,3],south:[6,9,3],allow:[10,3],furnish:1,mydat:[6,3],lsb:3,move:[5,7,3,4],maidenhead:[6,3],soon:[5,7,3],through:[9,8,3],get_ituz:[9,3],itu:9,paramet:[6,9,10,3],clublogxml:[10,3],fit:1,tort:1,therefor:[10,3],lookup_ent:[10,3],"return":[6,9,10,3],python:[0,9,10,3],timestamp:[9,10,3],dai:[0,10,8,3,6],band:[5,7,3],verifi:[],now:[10,8,3,4],qrp:[],name:[9,3],mode:[5,7,3],each:8,found:[9,10,3],c6a:4,attributeerror:[6,3],"short":4,replac:[10,3],"static":[9,3],connect:[10,3,1],year:[6,10,8,3],wgs84:[],event:1,out:[3,1],shown:8,lookuptyp:[10,9,8,3],rep:[10,9,8,3],publish:1,content:[],internet:[10,3],print:[6,10,8,3],bla:[],calculate_sunrise_sunset:[6,8,3],pleas:[5,7,3],given:[10,3],free:1,base:[0,4],dictionari:[9,10,3],org:[0,9,10,3],freq:[5,7,3],lookup_callsign:[10,3],hc2:[9,3],frequenc:4,could:[9,3],dp0gvn:[10,3],assign:[10,3],frequent:0,first:[6,8,3],oper:[10,3],softwar:1,suffix:[9,3],directli:[10,3],famou:[],restrict:1,lat:0,wrapper:[10,3],noresult:[],miss:[9,10,3],utc:[6,9,10,3],differ:[9,10,3,4],"long":[0,3,6],christma:[10,3],data:[10,9,8,3],jn48qm:[],my_dat:8,construct:[9,8,3],station:[10,3],conveni:8,store:[10,3],option:[6,9,10,3],copi:[10,3,1],getter:[],pars:0,holder:1,kind:1,provid:[10,9,3,1],remov:[5,7,3],structur:[],charact:[6,3],str:[9,10,3],posit:[6,3],pre:[9,3],"function":[5,7,8,3],well:[10,3],ani:[9,3,1],antarctica:[9,10,3],need:[0,8],north:[6,9,3],seem:[10,3],sell:1,hamtest:0,note:[],also:[10,3],exampl:9,redis_prefix:[10,3],which:[0,10,3],get_adif_id:[9,3],mit:[0,1],germani:[10,9,8,3],distribut:1,shall:1,object:[10,9,8,3],most:[9,3],sublicens:1,bsd:[],america:[9,3],"class":[0,10,9,8,3],charg:1,homogen:[10,3],don:[5,7,9,3],wellnitz:1,sunset:[],show:[10,3],text:[],locator_to_latlong:[6,3],myapikei:[10,3],concurr:[10,3],get_contin:[9,3],permiss:1,xml:[9,10,3],access:[],onli:[9,3],locat:[],copyright:1,explain:[],activ:[9,3],should:[],jan:[6,3],dict:[6,9,10,3],ituz:[10,9,8,3],tzinfo:[6,9,10,3],local:[10,3],overwritten:[10,3],variou:[10,3],morning_dawn:[6,3],express:1,liabl:1,geo:[],requir:[10,3],"default":[10,3],latlong_to_loc:[6,8,3],stuff:[],contain:[6,9,10,3],septemb:4,where:[9,3],set:[10,3],copy_data_in_redi:[10,3],see:0,arg:[6,10,3],subject:1,oceania:[9,3],correctli:4,databas:[0,10,9,8,3],written:[],between:[],"import":[6,10,9,8,3],irc:0,accord:[5,7,3],kei:[10,3],calculate_head:[6,8,3],entir:[9,10,3],distinguish:[10,3],come:0,against:[0,10,3],etc:[9,3],instanc:[9,10,3],countri:[9,4],com:[0,10,9,8,3],strftime:8,load:[10,3],latitud:9,damag:1,liabil:1,west:[6,3],three:[10,3],been:[5,7,10,3],cqz:[10,9,8,3],is_invalid_oper:[10,3],valueerror:[6,9,3],thousand:0,convert:[6,5,7,3],coordin:9,pytz:[6,9,10,3],understand:8,"case":[9,3],east:[6,3],aim:[10,3],"while":[9,3],apikei:[10,3],abov:1,webirc:0,almost:8,my_lookuplib:[10,9,8,3],non:[6,3],cluster:[],contract:1,substanti:1,dedic:[9,3],sever:[0,9,10,3],grant:1,perform:[0,10,8,3],same:[10,3],get_lat_long:[9,3],decod:4,lookuplib:[],complet:[10,3],"5w1cfn":[10,3],calculate_heading_longpath:[6,8,3],http:[0,10,3],clublog:[0,9,10,3],rais:[6,9,10,3],noninfring:1,off:[9,3],entri:[9,3],clublogapi:[10,3],without:[9,3,1],vk9xo:[10,3],person:1,contact:[],thi:[1,3,5,7,8,9,10],entiti:[10,3],latest:8,looktyp:[10,3],identifi:[9,10,3],obtain:[10,3,1],europ:[9,3],except:[10,3],other:1,input:[6,3],logger:[9,10,3],save:[10,3],match:[10,3],applic:0,format:[],distanc:[],like:[],specif:[9,10,3],deprec:[7,4],instanci:[10,8,3],republ:[9,3],necessari:[],either:[6,3],page:0,underli:[9,3],www:[],right:1,old:[10,3],deal:1,some:[0,10,8,3],callsign:9,home:[9,3],successfulli:[10,3],librari:[0,10,3],feder:[9,3],per:0,lookup_zone_except:[10,3],inject:[10,9,8,3],condit:1,complic:[],refer:8,"4km":8,run:[10,3],"__name__":[9,10,3],longpath:[],island:[10,3],slightli:[9,3],unfortun:[9,3],locator2:[6,8,3],locator1:[6,8,3],apikeymissingerror:[10,3],"float":[6,3],dxheat:0,automat:8,warranti:1,strip:[9,3],ea1:[],evening_dawn:[6,3],merg:1,get_al:[9,8,3],log:[9,10,3],wai:[],whom:1,fast:[10,3],avail:[9,10,3],start:[6,3],reli:[9,3],interfac:[10,3],includ:1,bandplan:[0,5,7,3],head:[],amateur:[0,9,10,3],tupl:[6,3],keyerror:[9,10,3],redis_inst:[10,3],sunris:[],my_loc:8,rotuma:[10,3],"true":[9,10,3],cic:[9,8,3],countryfil:[10,9,8,3],whether:1,record:[10,3],below:8,contin:[10,9,8,3],limit:1,"1fkm":8,otherwis:1,khz:[5,7,3],creat:[0,10,3],"int":[9,10,3],get_homecal:[9,3],doesn:[9,3],exist:[9,10,3],file:[0,1,3,8,9,10],our:8,pip:[10,3],deltaxrai:0,check:[0,9,10,3],incorrect:[10,3],when:[6,9,10,3],detail:[10,3],invalid:[6,10,3],valid:[9,10,3],bool:[9,10,3],you:[0,8],example_gener:[],"15z":8,longitud:9,turkmenistan:[10,3],infrequ:[10,3],faster:0,descript:[],portion:1,getlogg:[9,10,3],time:[6,10,3],hello:[],daili:[10,3]},objtypes:{"0":"py:module","1":"py:function","2":"py:staticmethod","3":"py:method","4":"py:class"},objnames:{"0":["py","module","Python module"],"1":["py","function","Python function"],"2":["py","staticmethod","Python static method"],"3":["py","method","Python method"],"4":["py","class","Python class"]},filenames:["index","license","help","reference","changelog","utils","locator","frequency","examples","callinfo","lookupLib"],titles:["PyHamTools","license","help","Reference","Changelog","Utils","Locator calculations","Frequency","Examples","Callinfo","LookupLib"],objects:{pyhamtools:{locator:[3,0,0,"-"],utils:[5,0,0,"-"],frequency:[3,0,0,"-"],callinfo:[3,0,0,"-"],lookuplib:[3,0,0,"-"]},"pyhamtools.utils":{freq_to_band:[5,1,1,""]},"pyhamtools.lookuplib":{LookupLib:[3,4,1,""]},"pyhamtools.lookuplib.LookupLib":{lookup_entity:[3,3,1,""],lookup_zone_exception:[3,3,1,""],lookup_prefix:[3,3,1,""],copy_data_in_redis:[3,3,1,""],lookup_callsign:[3,3,1,""],is_invalid_operation:[3,3,1,""]},"pyhamtools.callinfo":{Callinfo:[3,4,1,""]},"pyhamtools.locator":{calculate_heading:[3,1,1,""],calculate_heading_longpath:[3,1,1,""],calculate_distance:[3,1,1,""],latlong_to_locator:[3,1,1,""],locator_to_latlong:[3,1,1,""],calculate_distance_longpath:[3,1,1,""],calculate_sunrise_sunset:[3,1,1,""]},"pyhamtools.callinfo.Callinfo":{get_cqz:[3,3,1,""],get_continent:[3,3,1,""],get_homecall:[3,2,1,""],get_country_name:[3,3,1,""],get_all:[3,3,1,""],get_lat_long:[3,3,1,""],is_valid_callsign:[3,3,1,""],get_adif_id:[3,3,1,""],get_ituz:[3,3,1,""]},"pyhamtools.frequency":{freq_to_band:[3,1,1,""]}},titleterms:{latitud:8,distanc:8,help:2,modul:[],indic:0,header:[],callsign:8,tabl:0,pyhamtool:[0,3,4],itu:8,callinfo:[9,3],locat:[6,8,3],welcom:[],zone:8,anoth:[],licens:1,jn48qm:8,two:8,content:[],contact:1,decod:8,between:8,document:0,simpl:[],lookuplib:[10,3],refer:3,head:8,wgs84:8,get:8,clase:[],util:[5,3],coordin:8,sunris:8,countri:8,longitud:8,longpath:8,shortpath:8,deprec:3,frequenc:[7,3],changelog:4,calcul:[6,8],exampl:8,sunset:8,januari:8}}) \ No newline at end of file +Search.setIndex({envversion:42,terms:{all:[3,1],code:[0,3],illustr:[],queri:[5,3],"9h3a":4,month:[5,3],prefix:3,follow:[3,1],typeerror:3,depend:3,inoffici:[],zone:[],tobia:1,aris:1,merchant:1,digit:3,sourc:3,string:3,fals:3,shortpath:[],util:[],octob:4,list:[3,4],upload:3,"try":3,item:3,quick:5,get_contin:3,readthedoc:0,get_cqz:3,impli:1,consequ:3,second:3,download:[5,3],even:3,index:[0,3],lookup_prefix:3,neg:3,section:5,"while":3,asia:3,current:3,delet:3,version:0,method:3,iaru:[0,3],calculate_dist:[5,3],here:3,let:3,path:3,modifi:1,valu:3,search:0,convers:0,anymor:3,cty:3,precis:3,datetim:[5,3],doctest:[],permit:1,action:1,extrem:3,typic:3,dh1tw:[3,0,2,1,5],freq_to_band:[3,4],vp5:[],modul:[],africa:3,filenam:3,api:3,instal:3,redi:3,callinfo:[],fed:[5,3],from:[3,1,5],usb:3,would:3,memori:3,sake:5,two:[],next:[5,3],connector:3,qf67bf:[5,3],call:[3,4],is_valid_callsign:3,dxcluster:0,type:3,more:3,capit:3,notic:[3,1],files_:[],particular:1,known:3,herebi:1,none:3,retriev:3,cluster:[],work:[5,3],can:[5,3],purpos:[3,1],deg:3,claim:1,give:[5,3],process:3,calc_dat:3,"14z":5,calculate_distance_longpath:3,unavail:3,onlin:3,plist:3,mylookuplib:3,secur:[],get_country_nam:3,qrzpwd:[],how:[5,3],verifi:[],updat:3,product:0,express:1,befor:3,wrong:3,adif:[],lat:0,"3d2ri":3,data:[5,3],"short":4,author:1,correspond:3,assign:3,issu:0,inform:[5,3],frequent:0,allow:3,furnish:1,oper:3,lsb:3,offici:3,move:[3,4],maidenhead:3,soon:3,veri:3,through:[5,3],get_ituz:3,itu:[],sunris:[],paramet:3,clublogxml:3,fit:1,hb9bza:3,tort:1,therefor:3,lookup_ent:3,"return":3,python:[0,3],timestamp:3,dai:[0,5,3],band:3,instead:3,now:[5,3,4],warranti:1,name:[],mode:3,each:5,found:3,unicod:3,complet:3,attributeerror:3,replac:3,"static":3,connect:[3,1],year:[5,3],http:[0,3],event:1,out:[3,1],shown:5,lookuptyp:[5,3],network:3,rep:[5,3],publish:1,content:[],internet:3,print:[5,3],bla:[],calculate_sunrise_sunset:[5,3],get_eqsl_us:3,pleas:3,given:3,free:1,base:[0,4],dictionari:3,org:[0,3],freq:3,lookup_callsign:3,basi:3,hc2:3,frequenc:[],could:3,dp0gvn:3,rais:3,gethomecal:[],south:3,first:[5,3],mydat:3,softwar:1,suffix:3,directli:3,famou:[],restrict:1,date:3,wrapper:3,noresult:[],miss:3,utc:3,differ:[3,4],christma:3,associ:1,jn48qm:[],reli:3,construct:[5,3],station:3,conveni:5,store:3,option:3,copi:[3,1],getter:[],pars:0,holder:1,kind:1,provid:[3,1],remov:3,structur:[],charact:3,str:3,posit:3,pre:3,bandplan:[0,3],clublogapi:3,ani:[3,1],antarctica:3,need:[0,5],amateur:[0,3],seem:3,sell:1,person:1,note:[],also:3,exampl:[],redis_prefix:3,which:[0,3],get_adif_id:3,subject:1,mit:[0,1],germani:[5,3],distribut:1,shall:1,usernam:3,object:[5,3],most:3,sublicens:1,bsd:[],america:3,"class":[0,5,3],charg:1,homogen:3,don:3,url:3,wellnitz:1,sunset:[],show:3,text:[],locator_to_latlong:3,myapikei:3,concurr:3,radio:[0,3],permiss:1,xml:3,access:[],onli:3,locat:[],copyright:1,explain:[],activ:3,should:[],jan:3,dict:3,ituz:[5,3],tzinfo:3,local:3,overwritten:3,variou:3,morning_dawn:3,ad1c:[0,5],liabl:1,geo:[],requir:3,mylist:3,whether:1,latlong_to_loc:[5,3],stuff:[],contain:3,logbook:3,septemb:4,where:3,set:3,copy_data_in_redi:3,see:0,arg:3,get_lotw_us:3,oceania:3,correctli:4,databas:[0,5,3],lotw:[3,4],written:[],between:[],"import":[5,3],irc:0,accord:3,kei:3,calculate_head:[5,3],entir:3,distinguish:3,come:0,last:3,against:[0,3],etc:3,instanc:3,countri:[],com:[0,5,3],strftime:5,load:3,latitud:[],ioerror:3,damag:1,liabil:1,west:3,three:3,been:3,github:0,cqz:[5,3],is_invalid_oper:3,valueerror:3,thousand:0,convert:3,qrzuser:[],coordin:[],pytz:3,understand:5,"case":3,save:3,aim:3,calcul:[],apikei:3,abov:1,webirc:0,almost:5,my_lookuplib:[5,3],non:3,clublog_:[],kwarg:3,contract:1,substanti:1,dedic:3,sever:[0,3],grant:1,perform:[0,5,3],same:3,get_lat_long:3,decod:[],lookuplib:[],c6a:4,"5w1cfn":3,calculate_heading_longpath:[5,3],wgs84:[],clublog:[0,3],eqsl:[3,4],user:[3,4],noninfring:1,off:3,entri:3,well:3,without:[3,1],vk9xo:3,hamtest:0,contact:[],thi:[3,1,5],entiti:3,latest:[5,3],looktyp:3,identifi:3,obtain:[3,1],weekli:3,europ:3,except:3,valid:3,input:3,logger:3,east:3,match:3,applic:0,format:[],distanc:[],world:3,password:3,mydict:3,like:[],specif:3,deprec:[],instanci:[5,3],republ:3,necessari:[],either:3,page:0,underli:3,www:[],right:1,old:3,deal:1,some:[0,5,3],callsign:[],home:3,successfulli:3,librari:[0,3],feder:3,per:0,lookup_zone_except:3,estim:3,inject:[5,3],condit:1,complic:[],refer:[],"4km":5,run:3,"__name__":3,longpath:[],island:3,slightli:3,unfortun:3,locator2:[5,3],locator1:[5,3],apikeymissingerror:3,"float":3,dxheat:0,automat:5,qrp:[],strip:3,ea1:[],qrz:3,bool:3,evening_dawn:3,merg:1,get_al:[5,3],fast:3,log:3,wai:[],whom:1,"long":[0,3],avail:3,start:3,my_dat:5,interfac:3,includ:1,wd5eae:3,"function":[5,3],head:[],north:3,tupl:3,keyerror:3,redis_inst:3,pwd:3,my_loc:5,rotuma:3,"true":3,cic:[5,3],countryfil:[5,3],made:3,"default":3,record:3,below:5,contin:[5,3],limit:1,"1fkm":5,otherwis:1,khz:3,creat:[0,3],"int":3,get_homecal:3,doesn:3,exist:3,file:[0,3,1,5],our:5,pip:3,deltaxrai:0,check:[0,3],incorrect:3,arrl:3,when:3,detail:3,invalid:3,other:1,lookup:[0,5,3],inoff:3,you:[0,5],example_gener:[],"15z":5,qsl:4,longitud:[],turkmenistan:3,infrequ:3,faster:0,descript:[],portion:1,daili:3,time:3,hello:[],getlogg:3},objtypes:{"0":"py:module","1":"py:function","2":"py:staticmethod","3":"py:method","4":"py:class"},objnames:{"0":["py","module","Python module"],"1":["py","function","Python function"],"2":["py","staticmethod","Python static method"],"3":["py","method","Python method"],"4":["py","class","Python class"]},filenames:["index","license","help","reference","changelog","examples"],titles:["PyHamTools","license","help","Reference","Changelog","Examples"],objects:{pyhamtools:{utils:[3,0,0,"-"],qsl:[3,0,0,"-"],locator:[3,0,0,"-"],frequency:[3,0,0,"-"],callinfo:[3,0,0,"-"],lookuplib:[3,0,0,"-"]},"pyhamtools.utils":{freq_to_band:[3,1,1,""]},"pyhamtools.qsl":{get_lotw_users:[3,1,1,""],get_eqsl_users:[3,1,1,""]},"pyhamtools.lookuplib":{LookupLib:[3,4,1,""]},"pyhamtools.lookuplib.LookupLib":{lookup_entity:[3,3,1,""],lookup_zone_exception:[3,3,1,""],lookup_prefix:[3,3,1,""],copy_data_in_redis:[3,3,1,""],lookup_callsign:[3,3,1,""],is_invalid_operation:[3,3,1,""]},"pyhamtools.callinfo":{Callinfo:[3,4,1,""]},"pyhamtools.locator":{calculate_heading:[3,1,1,""],calculate_heading_longpath:[3,1,1,""],calculate_distance:[3,1,1,""],latlong_to_locator:[3,1,1,""],locator_to_latlong:[3,1,1,""],calculate_distance_longpath:[3,1,1,""],calculate_sunrise_sunset:[3,1,1,""]},"pyhamtools.callinfo.Callinfo":{get_cqz:[3,3,1,""],get_continent:[3,3,1,""],get_homecall:[3,2,1,""],get_country_name:[3,3,1,""],get_all:[3,3,1,""],get_lat_long:[3,3,1,""],is_valid_callsign:[3,3,1,""],get_adif_id:[3,3,1,""],get_ituz:[3,3,1,""]},"pyhamtools.frequency":{freq_to_band:[3,1,1,""]}},titleterms:{latitud:5,distanc:5,help:2,modul:[],indic:0,header:[],callsign:5,tabl:0,pyhamtool:[0,3,4],itu:[],callinfo:3,locat:[5,3],welcom:[],zone:[],anoth:[],licens:1,jn48qm:5,two:5,content:[],exampl:5,decod:5,between:5,document:0,simpl:[],lookuplib:3,refer:3,head:5,wgs84:5,get:5,clase:[],qsl:3,util:3,coordin:5,sunris:5,adif:5,januari:5,longitud:5,longpath:5,shortpath:5,name:5,deprec:3,frequenc:3,changelog:4,calcul:5,contact:1,sunset:5,countri:5}}) \ No newline at end of file diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 976db8e..b04728e 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,6 +1,26 @@ Changelog --------- +PyHamTools 0.5.0 +================ + +5. April 2015 + + * implemented QRZ.com interface into LookupLib [LookupLib] + + * changed and unified all output to Unicode + + * corrected Longitude to General Standard (-180...0° West, 0...180° East) [LookupLib] + + * improved callsign decoding alogrithm [CallInfo] + + * added special case to decode location of VK9 callsigns [CallInfo] + + * added ValueError when LOTW data from file contains too many errors [qsl] + + * added handling of special callsigns which can't be decoded properly inside a separate + callsign exception file (e.g. 7QAA) + PyHamTools 0.4.2 ================ diff --git a/pyhamtools/callinfo.py b/pyhamtools/callinfo.py index 0d26700..b8d03e6 100644 --- a/pyhamtools/callinfo.py +++ b/pyhamtools/callinfo.py @@ -7,6 +7,7 @@ import pytz from pyhamtools.consts import LookupConventions as const +from pyhamtools.callsign_exceptions import callsign_exceptions UTC = pytz.UTC timestamp_now = datetime.utcnow().replace(tzinfo=UTC) @@ -80,6 +81,10 @@ class Callinfo(object): def _iterate_prefix(self, callsign, timestamp=timestamp_now): """truncate call until it corresponds to a Prefix in the database""" prefix = callsign + + if re.search('(VK|AX|VI)9[A-Z]{3}', callsign): #special rule for VK9 calls + if timestamp > datetime(2006,1,1, tzinfo=UTC): + prefix = callsign[0:3]+callsign[4:5] while len(prefix) > 0: try: @@ -139,7 +144,7 @@ class Callinfo(object): appendix = re.search('/[A-Z0-9]{2,4}$', callsign) appendix = re.sub('/', '', appendix.group(0)) self._logger.debug("appendix: " + appendix) - + if appendix == 'MM': # special case Martime Mobile #self._mm = True return { @@ -173,6 +178,10 @@ class Callinfo(object): elif appendix == "LH": # Filter all Lighthouses callsign = re.sub('/LH', '', callsign) return self._iterate_prefix(callsign, timestamp) + elif re.search('[A-Z]{3}', appendix): #case of US county(?) contest N3HBX/UAL + callsign = re.sub('/[A-Z]{3}$', '', callsign) + return self._iterate_prefix(callsign, timestamp) + else: # check if the appendix is a valid country prefix return self._iterate_prefix(re.sub('/', '', appendix), timestamp) @@ -205,10 +214,17 @@ class Callinfo(object): elif re.search('^[A-Z0-9]{1,4}/', entire_callsign): pfx = re.search('^[A-Z0-9]{1,4}/', entire_callsign) pfx = re.sub('/', '', pfx.group(0)) - return self._iterate_prefix(pfx) + #make sure that the remaining part is actually a callsign (avoid: OZ/JO81) + rest = re.search('/[A-Z0-9]+', entire_callsign) + rest = re.sub('/', '', rest.group(0)) + if re.match('^[\d]{0,1}[A-Z]{1,2}\d([A-Z]{1,4}|\d{3,3}|\d{1,3}[A-Z])[A-Z]{0,5}$', rest): + return self._iterate_prefix(pfx) + if entire_callsign in callsign_exceptions: + return self._iterate_prefix(callsign_exceptions[entire_callsign]) + self._logger.debug("Could not decode " + callsign) - raise KeyError + raise KeyError("Callsign could not be decoded") def _lookup_callsign(self, callsign, timestamp=timestamp_now): @@ -241,7 +257,7 @@ class Callinfo(object): 'longitude': 0.0 } - # Check if a dedicated entry exists for the callsign + # Check if a dedicated entry/exception exists for the callsign try: data = self._lookuplib.lookup_callsign(callsign, timestamp).copy() if self.check_if_beacon(callsign): diff --git a/pyhamtools/callsign_exceptions.py b/pyhamtools/callsign_exceptions.py new file mode 100644 index 0000000..911c000 --- /dev/null +++ b/pyhamtools/callsign_exceptions.py @@ -0,0 +1,6 @@ + + +callsign_exceptions={ + '7QAA' : '7Q', + '2SZ' : 'G0' +} \ No newline at end of file diff --git a/pyhamtools/consts.py b/pyhamtools/consts.py index 950a141..8f21589 100644 --- a/pyhamtools/consts.py +++ b/pyhamtools/consts.py @@ -4,69 +4,110 @@ class LookupConventions: """ This class defines the constants used within the pyhamtools package """ # Mostly specific to Clublog XML File - CALLSIGN = "callsign" - COUNTRY = "country" - PREFIX = "prefix" - ADIF = "adif" - CQZ = "cqz" - ITUZ = "ituz" - CONTINENT = "continent" - LATITUDE = "latitude" - LONGITUDE = "longitude" - START = "start" - END = "end" - WHITELIST = "whitelist" - WHITELIST_START = "whitelist_start" - WHITELIST_END = "whitelist_end" - DELETED = "deleted" - MARITIME_MOBILE = "mm" - AIRCRAFT_MOBILE = "am" - LOCATOR = "locator" - BEACON = "beacon" + CALLSIGN = u"callsign" + COUNTRY = u"country" + PREFIX = u"prefix" + ADIF = u"adif" + CQZ = u"cqz" + ITUZ = u"ituz" + CONTINENT = u"continent" + LATITUDE = u"latitude" + LONGITUDE = u"longitude" + START = u"start" + END = u"end" + WHITELIST = u"whitelist" + WHITELIST_START = u"whitelist_start" + WHITELIST_END = u"whitelist_end" + DELETED = u"deleted" + MARITIME_MOBILE = u"mm" + AIRCRAFT_MOBILE = u"am" + LOCATOR = u"locator" + BEACON = u"beacon" #CQ / DIGITAL Skimmer specific - SKIMMER = "skimmer" - FS = "fs" #fieldstrength - WPM = "wpm" #words / bytes per second - CQ = "cq" - NCDXF = "ncdxf" + SKIMMER = u"skimmer" + FS = u"fs" #fieldstrength + WPM = u"wpm" #words / bytes per second + CQ = u"cq" + NCDXF = u"ncdxf" # Modes - CW = "CW" - USB = "USB" - LSB = "LSB" - DIGITAL = "DIGITAL" - FM = "FM" + CW = u"CW" + USB = u"USB" + LSB = u"LSB" + DIGITAL = u"DIGITAL" + FM = u"FM" #DX Spot - SPOTTER = "spotter" - DX = "dx" - FREQUENCY = "frequency" - COMMENT = "comment" - TIME = "time" - BAND = "band" - MODE = "mode" + SPOTTER = u"spotter" + DX = u"dx" + FREQUENCY = u"frequency" + COMMENT = u"comment" + TIME = u"time" + BAND = u"band" + MODE = u"mode" #DX Spider specific - ORIGIN_NODE = "node" - HOPS = "hops" - RAW_SPOT = "raw" - IP = "ip" - ROUTE = "route" - TEXT = "text" - SYSOP_FLAG = "sysop_flag" - WX_FLAG = "wx_flag" + ORIGIN_NODE = u"node" + HOPS = u"hops" + RAW_SPOT = u"raw" + IP = u"ip" + ROUTE = u"route" + TEXT = u"text" + SYSOP_FLAG = u"sysop_flag" + WX_FLAG = u"wx_flag" #WWV & WCY - STATION = "station" - R = "r" - K = "k" - EXPK = "expk" - SFI = "sfi" - A = "a" - AURORA = "aurora" - SA = "sa" - GMF = "gmf" - FORECAST = "forecast" + STATION = u"station" + R = u"r" + K = u"k" + EXPK = u"expk" + SFI = u"sfi" + A = u"a" + AURORA = u"aurora" + SA = u"sa" + GMF = u"gmf" + FORECAST = u"forecast" + + #QRZ.com + XREF = u"xref" + ALIASES = u"aliases" + FNAME = u"fname" + NAME = u"name" + ADDR1 = u"addr1" + ADDR2 = u"addr2" + STATE = u"state" + ZIPCODE = u"zipcode" + CCODE = u"ccode" + COUNTY = u"county" + FIPS = u"fips" + LAND = u"land" + EFDATE = u"efdate" + EXPDATE = u"expdate" + P_CALL = u"p_call" + LICENSE_CLASS = u"license_class" + CODES = u"codes" + QSLMGR = u"qslmgr" + EMAIL = u"email" + URL = u"url" + U_VIEWS = u"u_views" + BIO = u"bio" + BIODATE = u"biodate" + IMAGE = u"image" + IMAGE_INFO = u"imageinfo" + SERIAL = u"serial" + MODDATE = u"moddate" + MSA = "msa" + AREACODE = "areacode" + TIMEZONE = "timezone" + GMTOFFSET = "gmtoffset" + DST = "dst" + EQSL = "eqsl" + MQSL = "mqsl" + LOTW = "lotw" + BORN = "born" + USER_MGR = "user" + IOTA = "iota" + GEOLOC = "geoloc" diff --git a/pyhamtools/logparser.py b/pyhamtools/logparser.py new file mode 100644 index 0000000..9a05404 --- /dev/null +++ b/pyhamtools/logparser.py @@ -0,0 +1,38 @@ +import os +import re +from datetime import datetime + +def import_cabrillo(filename): + log = None; + log_import = None + with open(filename, 'r') as f: + log_import = f.read() + log = [] + log_import = log_import.split("\r\n") + + for qso in log_import: + + if re.match("^QSO", qso): + freq = int(qso[4:11]) + mode = qso[11:13] + time = datetime.strptime(qso[14:29], "%Y-%m-%d %H%M") + frm = qso[30:44].strip() + sent_rst = int(qso[44:47]) + sent_exchange = qso[48:55].strip() + qso_partner = qso[55:68].strip() + rcvd_rst = int(qso[69:72]) + rcvd_exchange = qso[73:79].strip() + station = int(qso[80]) + log.append({ + "freq": freq, + "mode":mode, + "time":time, + "from": frm, + "sent_rst":sent_rst, + "sent_exchange": sent_exchange, + "qso_partner": qso_partner, + "rcvd_rst": rcvd_rst, + "rcvd_exchange": rcvd_exchange, + "station": station + }) + return log \ No newline at end of file diff --git a/pyhamtools/lookuplib.py b/pyhamtools/lookuplib.py index 03df6ec..5def8e3 100644 --- a/pyhamtools/lookuplib.py +++ b/pyhamtools/lookuplib.py @@ -9,12 +9,14 @@ import urllib import json import copy import sys +import unicodedata import requests from requests.exceptions import ConnectionError, HTTPError, Timeout +from bs4 import BeautifulSoup import pytz - +import version from consts import LookupConventions as const from exceptions import APIKeyMissingError @@ -54,6 +56,9 @@ class LookupLib(object): Args: lookuptype (str) : "clublogxml" or "clublogapi" or "countryfile" or "redis" apikey (str): Clublog API Key + username (str): QRZ.com username + pwd (str): QRZ.com password + apiv (str, optional): QRZ.com API Version filename (str, optional): Filename for Clublog XML or Country-files.com cty.plist file. When a local file is used, no Internet connection not API Key is necessary. logger (logging.getLogger(__name__), optional): Python logger @@ -62,7 +67,7 @@ class LookupLib(object): """ - def __init__(self, lookuptype = "countryfile", apikey=None, filename=None, logger=None, redis_instance=None, redis_prefix=None): + def __init__(self, lookuptype = "countryfile", apikey=None, apiv="1.3.3", filename=None, logger=None, username=None, pwd=None, redis_instance=None, redis_prefix=None): self._logger = None if logger: @@ -75,10 +80,13 @@ class LookupLib(object): self._logger.addHandler(logging.NullHandler()) self._apikey = apikey + self._apiv = apiv self._download = True self._lib_filename = filename self._redis = redis_instance self._redis_prefix = redis_prefix + self._username = username + self._pwd = pwd if self._lib_filename: self._download = False @@ -101,8 +109,36 @@ class LookupLib(object): pass elif self._lookuptype == "redis": import redis + elif self._lookuptype == "qrz": + self._apikey = self._get_qrz_session_key(self._username, self._pwd) else: raise AttributeError("Lookup type missing") + + def _get_qrz_session_key(self, username, pwd): + + qrz_api_version = "1.3.3" + url = "https://xmldata.qrz.com/xml/" + qrz_api_version + "/" + agent = "PyHT"+version.__version__ + + params = {"username" : username, + "password" : pwd, + "agent" : agent + } + + encodeurl = url + "?" + urllib.urlencode(params) + response = requests.get(encodeurl, timeout=5) + doc = BeautifulSoup(response.text) + session_key = None + if doc.session.key: + session_key = doc.session.key.text + else: + if doc.session.error: + raise ValueError(doc.session.error.text) + else: + raise ValueError("Could not retrieve Session Key from QRZ.com") + + return session_key + def copy_data_in_redis(self, redis_prefix, redis_instance): """ @@ -135,8 +171,8 @@ class LookupLib(object): >>> my_lookuplib.lookup_callsign("3D2RI") { u'adif': 460, - u'continent': 'OC', - u'country': 'Rotuma Island', + u'continent': u'OC', + u'country': u'Rotuma Island', u'cqz': 32, u'ituz': 56, u'latitude': -12.48, @@ -217,12 +253,12 @@ class LookupLib(object): >>> print my_lookuplib.lookup_entity(273) { 'deleted': False, - 'country': 'TURKMENISTAN', + 'country': u'TURKMENISTAN', 'longitude': -58.4, 'cqz': 17, - 'prefix': 'EZ', + 'prefix': u'EZ', 'latitude': 38.0, - 'continent': 'AS' + 'continent': u'AS' } @@ -241,16 +277,18 @@ class LookupLib(object): raise KeyError elif self._lookuptype == "redis": - if self._redis_prefix is None: raise KeyError ("redis_prefix is missing") - #entity = str(entity) json_data = self._redis.get(self._redis_prefix + "_entity_" + str(entity)) if json_data is not None: my_dict = self._deserialize_data(json_data) return self._strip_metadata(my_dict) + elif self._lookuptype == "qrz": + result = self._lookup_qrz_dxcc(entity, self._apikey) + return result + # no matching case raise KeyError @@ -297,12 +335,12 @@ class LookupLib(object): >>> timestamp = datetime(year=1962, month=7, day=7, tzinfo=pytz.UTC) >>> print my_lookuplib.lookup_callsign("VK9XO", timestamp) { - 'country': 'CHRISTMAS ISLAND', + 'country': u'CHRISTMAS ISLAND', 'longitude': -105.7, 'cqz': 29, 'adif': 35, 'latitude': -10.5, - 'continent': 'OC' + 'continent': u'OC' } Note: @@ -311,8 +349,10 @@ class LookupLib(object): - clublogxml - clublogapi - countryfile + - qrz.com - redis + """ callsign = callsign.strip().upper() @@ -333,7 +373,10 @@ class LookupLib(object): return self._check_data_for_date(callsign, timestamp, data_dict, index) # no matching case - raise KeyError + elif self._lookuptype == "qrz": + return self._lookup_qrz_callsign(callsign, self._apikey, self._apiv) + + raise KeyError("unknown Callsign") def _get_dicts_from_redis(self, name, index_name, redis_prefix, item): """ @@ -454,12 +497,12 @@ class LookupLib(object): >>> print myLookupLib.lookup_prefix("DH") { 'adif': 230, - 'country': 'Fed. Rep. of Germany', + 'country': u'Fed. Rep. of Germany', 'longitude': -10.0, 'cqz': 14, 'ituz': 28, 'latitude': 51.0, - 'continent': 'EU' + 'continent': u'EU' } Note: @@ -644,17 +687,243 @@ class LookupLib(object): lookup = {} for item in jsonLookup: - if item == "Name": lookup[const.COUNTRY] = str(jsonLookup["Name"]) + if item == "Name": lookup[const.COUNTRY] = jsonLookup["Name"] elif item == "DXCC": lookup[const.ADIF] = int(jsonLookup["DXCC"]) elif item == "Lon": lookup[const.LONGITUDE] = float(jsonLookup["Lon"]) elif item == "Lat": lookup[const.LATITUDE] = float(jsonLookup["Lat"]) elif item == "CQZ": lookup[const.CQZ] = int(jsonLookup["CQZ"]) - elif item == "Continent": lookup[const.CONTINENT] = str(jsonLookup["Continent"]) - + elif item == "Continent": lookup[const.CONTINENT] = jsonLookup["Continent"] + if lookup[const.ADIF] == 0: raise KeyError else: return lookup + + def _request_callsign_info_from_qrz(self, callsign, apikey, apiv="1.3.3"): + qrz_api_version = apiv + url = "https://xmldata.qrz.com/xml/" + qrz_api_version + "/" + + params = { + "s": apikey, + "callsign" : callsign, + } + + encodeurl = url + "?" + urllib.urlencode(params) + response = requests.get(encodeurl, timeout=5) + return response + + def _request_dxcc_info_from_qrz(self, dxcc_or_callsign, apikey, apiv="1.3.3"): + qrz_api_version = apiv + url = "https://xmldata.qrz.com/xml/" + qrz_api_version + "/" + + params = { + "s": apikey, + "dxcc" : str(dxcc_or_callsign), + } + + encodeurl = url + "?" + urllib.urlencode(params) + response = requests.get(encodeurl, timeout=5) + return response + + def _lookup_qrz_dxcc(self, dxcc_or_callsign, apikey, apiv="1.3.3"): + """ Performs the dxcc lookup against the QRZ.com XML API: + """ + + response = self._request_dxcc_info_from_qrz(dxcc_or_callsign, apikey, apiv=apiv) + + root = BeautifulSoup(response.text) + lookup = {} + + if root.error: #try to get a new session key and try to request again + + if re.search('No DXCC Information for', root.error.text, re.I): #No data available for callsign + raise KeyError(root.error.text) + elif re.search('Session Timeout', root.error.text, re.I): # Get new session key + self._apikey = apikey = self._get_qrz_session_key(self._username, self._pwd) + response = self._request_dxcc_info_from_qrz(dxcc_or_callsign, apikey) + root = BeautifulSoup(response.text) + else: + raise AttributeError("Session Key Missing") #most likely session key missing or invalid + + if root.dxcc is None: + raise ValueError + + if root.dxcc.dxcc: + lookup[const.ADIF] = int(root.dxcc.dxcc.text) + if root.dxcc.cc: + lookup['cc'] = root.dxcc.cc.text + if root.dxcc.cc: + lookup['ccc'] = root.dxcc.ccc.text + if root.find('name'): + lookup[const.COUNTRY] = root.find('name').get_text() + if root.dxcc.continent: + lookup[const.CONTINENT] = root.dxcc.continent.text + if root.dxcc.ituzone: + lookup[const.ITUZ] = int(root.dxcc.ituzone.text) + if root.dxcc.cqzone: + lookup[const.CQZ] = int(root.dxcc.cqzone.text) + if root.dxcc.timezone: + lookup['timezone'] = float(root.dxcc.timezone.text) + if root.dxcc.lat: + lookup[const.LATITUDE] = float(root.dxcc.lat.text) + if root.dxcc.lon: + lookup[const.LONGITUDE] = float(root.dxcc.lon.text) + + return lookup + + + def _lookup_qrz_callsign(self, callsign=None, apikey=None, apiv="1.3.3"): + """ Performs the callsign lookup against the QRZ.com XML API: + """ + + if apikey is None: + raise AttributeError("Session Key Missing") + + callsign = callsign.upper() + + response = self._request_callsign_info_from_qrz(callsign, apikey, apiv) + + root = BeautifulSoup(response.text) + lookup = {} + + if root.error: #try to get a new session key and try to request again + + if re.search('Not found', root.error.text, re.I): #No data available for callsign + raise KeyError(root.error.text) + elif re.search('Session Timeout', root.error.text, re.I): # Get new session key + self._apikey = apikey = self._get_qrz_session_key(self._username, self._pwd) + response = self._request_callsign_info_from_qrz(callsign, apikey) + root = BeautifulSoup(response.text) + else: + raise AttributeError(root.error.text) #most likely session key missing or invalid + + if root.callsign is None: + raise ValueError + + if root.callsign.call: + lookup[const.CALLSIGN] = root.callsign.call.text + if root.callsign.xref: + lookup[const.XREF] = root.callsign.xref.text + if root.callsign.aliases: + lookup[const.ALIASES] = root.callsign.aliases.text.split(',') + if root.callsign.dxcc: + lookup[const.ADIF] = int(root.callsign.dxcc.text) + if root.callsign.fname: + lookup[const.FNAME] = root.callsign.fname.text + if root.callsign.find("name"): + lookup[const.NAME] = root.callsign.find('name').get_text() + if root.callsign.addr1: + lookup[const.ADDR1] = root.callsign.addr1.text + if root.callsign.addr2: + lookup[const.ADDR2] = root.callsign.addr2.text + if root.callsign.state: + lookup[const.STATE] = root.callsign.state.text + if root.callsign.zip: + lookup[const.ZIPCODE] = root.callsign.zip.text + if root.callsign.country: + lookup[const.COUNTRY] = root.callsign.country.text + if root.callsign.ccode: + lookup[const.CCODE] = int(root.callsign.ccode.text) + if root.callsign.lat: + lookup[const.LATITUDE] = float(root.callsign.lat.text) + if root.callsign.lon: + lookup[const.LONGITUDE] = float(root.callsign.lon.text) + if root.callsign.grid: + lookup[const.LOCATOR] = root.callsign.grid.text + if root.callsign.county: + lookup[const.COUNTY] = root.callsign.county.text + if root.callsign.fips: + lookup[const.FIPS] = int(root.callsign.fips.text) # check type + if root.callsign.land: + lookup[const.LAND] = root.callsign.land.text + if root.callsign.efdate: + try: + lookup[const.EFDATE] = datetime.strptime(root.callsign.efdate.text, '%Y-%m-%d').replace(tzinfo=UTC) + except ValueError: + self._logger.debug("[QRZ.com] efdate: Invalid DateTime; " + callsign + " " + root.callsign.efdate.text) + if root.callsign.expdate: + try: + lookup[const.EXPDATE] = datetime.strptime(root.callsign.expdate.text, '%Y-%m-%d').replace(tzinfo=UTC) + except ValueError: + self._logger.debug("[QRZ.com] expdate: Invalid DateTime; " + callsign + " " + root.callsign.expdate.text) + if root.callsign.p_call: + lookup[const.P_CALL] = root.callsign.p_call.text + if root.callsign.find('class'): + lookup[const.LICENSE_CLASS] = root.callsign.find('class').get_text() + if root.callsign.codes: + lookup[const.CODES] = root.callsign.codes.text + if root.callsign.qslmgr: + lookup[const.QSLMGR] = root.callsign.qslmgr.text + if root.callsign.email: + lookup[const.EMAIL] = root.callsign.email.text + if root.callsign.url: + lookup[const.URL] = root.callsign.url.text + if root.callsign.u_views: + lookup[const.U_VIEWS] = int(root.callsign.u_views.text) + if root.callsign.bio: + lookup[const.BIO] = root.callsign.bio.text + if root.callsign.biodate: + try: + lookup[const.BIODATE] = datetime.strptime(root.callsign.biodate.text, '%Y-%m-%d %H:%M:%S').replace(tzinfo=UTC) + except ValueError: + self._logger.warning("[QRZ.com] biodate: Invalid DateTime; " + callsign) + if root.callsign.image: + lookup[const.IMAGE] = root.callsign.image.text + if root.callsign.imageinfo: + lookup[const.IMAGE_INFO] = root.callsign.imageinfo.text + if root.callsign.serial: + lookup[const.SERIAL] = long(root.callsign.serial.text) + if root.callsign.moddate: + try: + lookup[const.MODDATE] = datetime.strptime(root.callsign.moddate.text, '%Y-%m-%d %H:%M:%S').replace(tzinfo=UTC) + except ValueError: + self._logger.warning("[QRZ.com] moddate: Invalid DateTime; " + callsign) + if root.callsign.MSA: + lookup[const.MSA] = int(root.callsign.MSA.text) + if root.callsign.AreaCode: + lookup[const.AREACODE] = int(root.callsign.AreaCode.text) + if root.callsign.TimeZone: + lookup[const.TIMEZONE] = int(root.callsign.TimeZone.text) + if root.callsign.GMTOffset: + lookup[const.GMTOFFSET] = float(root.callsign.GMTOffset.text) + if root.callsign.DST: + if root.callsign.DST.text == "Y": + lookup[const.DST] = True + else: + lookup[const.DST] = False + if root.callsign.eqsl: + if root.callsign.eqsl.text == "1": + lookup[const.EQSL] = True + else: + lookup[const.EQSL] = False + if root.callsign.mqsl: + if root.callsign.mqsl.text == "1": + lookup[const.MQSL] = True + else: + lookup[const.MQSL] = False + if root.callsign.cqzone: + lookup[const.CQZ] = int(root.callsign.cqzone.text) + if root.callsign.ituzone: + lookup[const.ITUZ] = int(root.callsign.ituzone.text) + if root.callsign.born: + lookup[const.BORN] = int(root.callsign.born.text) + if root.callsign.user: + lookup[const.USER_MGR] = root.callsign.user.text + if root.callsign.lotw: + if root.callsign.lotw.text == "1": + lookup[const.LOTW] = True + else: + lookup[const.LOTW] = False + if root.callsign.iota: + lookup[const.IOTA] = root.callsign.iota.text + if root.callsign.geoloc: + lookup[const.GEOLOC] = root.callsign.geoloc.text + + # if sys.version_info >= (2,): + # for item in lookup: + # if isinstance(lookup[item], unicode): + # print item, repr(lookup[item]) + return lookup def _load_clublogXML(self, url="https://secure.clublog.org/cty.php", @@ -866,44 +1135,49 @@ class LookupLib(object): #retrieve ADIF Country Entities cty_entities = cty_tree.find("entities") + self._logger.debug("total entities: " + str(len(cty_entities))) if len(cty_entities) > 1: for cty_entity in cty_entities: - entity = {} - for item in cty_entity: - if item.tag == "name": - entity[const.COUNTRY] = str(item.text) - elif item.tag == "prefix": - entity[const.PREFIX] = str(item.text) - elif item.tag == "deleted": - if item.text == "TRUE": - entity[const.DELETED] = True - else: - entity[const.DELETED] = False - elif item.tag == "cqz": - entity[const.CQZ] = int(item.text) - elif item.tag == "cont": - entity[const.CONTINENT] = str(item.text) - elif item.tag == "long": - entity[const.LONGITUDE] = float(item.text)*(-1) - elif item.tag == "lat": - entity[const.LATITUDE] = float(item.text) - elif item.tag == "start": - dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') - entity[const.START] = dt.replace(tzinfo=UTC) - elif item.tag == "end": - dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') - entity[const.END] = dt.replace(tzinfo=UTC) - elif item.tag == "whitelist": - if item.text == "TRUE": - entity[const.WHITELIST] = True - else: - entity[const.WHITELIST] = False - elif item.tag == "whitelist_start": - dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') - entity[const.WHITELIST_START] = dt.replace(tzinfo=UTC) - elif item.tag == "whitelist_end": - dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') - entity[const.WHITELIST_END] = dt.replace(tzinfo=UTC) + try: + entity = {} + for item in cty_entity: + if item.tag == "name": + entity[const.COUNTRY] = unicode(item.text) + self._logger.debug(unicode(item.text)) + elif item.tag == "prefix": + entity[const.PREFIX] = unicode(item.text) + elif item.tag == "deleted": + if item.text == "TRUE": + entity[const.DELETED] = True + else: + entity[const.DELETED] = False + elif item.tag == "cqz": + entity[const.CQZ] = int(item.text) + elif item.tag == "cont": + entity[const.CONTINENT] = unicode(item.text) + elif item.tag == "long": + entity[const.LONGITUDE] = float(item.text)*(-1) + elif item.tag == "lat": + entity[const.LATITUDE] = float(item.text) + elif item.tag == "start": + dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') + entity[const.START] = dt.replace(tzinfo=UTC) + elif item.tag == "end": + dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') + entity[const.END] = dt.replace(tzinfo=UTC) + elif item.tag == "whitelist": + if item.text == "TRUE": + entity[const.WHITELIST] = True + else: + entity[const.WHITELIST] = False + elif item.tag == "whitelist_start": + dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') + entity[const.WHITELIST_START] = dt.replace(tzinfo=UTC) + elif item.tag == "whitelist_end": + dt = datetime.strptime(item.text[:19], '%Y-%m-%dT%H:%M:%S') + entity[const.WHITELIST_END] = dt.replace(tzinfo=UTC) + except AttributeError: + self._logger.error("Error while processing: ") entities[int(cty_entity[0].text)] = entity self._logger.debug(str(len(entities))+" Entities added") else: @@ -922,13 +1196,13 @@ class LookupLib(object): else: call_exceptions_index[call] = [int(cty_exception.attrib["record"])] elif item.tag == "entity": - call_exception[const.COUNTRY] = str(item.text) + call_exception[const.COUNTRY] = unicode(item.text) elif item.tag == "adif": call_exception[const.ADIF] = int(item.text) elif item.tag == "cqz": call_exception[const.CQZ] = int(item.text) elif item.tag == "cont": - call_exception[const.CONTINENT] = str(item.text) + call_exception[const.CONTINENT] = unicode(item.text) elif item.tag == "long": call_exception[const.LONGITUDE] = float(item.text)*(-1) elif item.tag == "lat": @@ -963,13 +1237,13 @@ class LookupLib(object): else: prefixes_index[call] = [int(cty_prefix.attrib["record"])] if item.tag == "entity": - prefix[const.COUNTRY] = str(item.text) + prefix[const.COUNTRY] = unicode(item.text) elif item.tag == "adif": prefix[const.ADIF] = int(item.text) elif item.tag == "cqz": prefix[const.CQZ] = int(item.text) elif item.tag == "cont": - prefix[const.CONTINENT] = str(item.text) + prefix[const.CONTINENT] = unicode(item.text) elif item.tag == "long": prefix[const.LONGITUDE] = float(item.text)*(-1) elif item.tag == "lat": @@ -1086,12 +1360,12 @@ class LookupLib(object): for item in cty_list: entry = {} call = str(item) - entry[const.COUNTRY] = str(cty_list[item]["Country"]) + entry[const.COUNTRY] = unicode(cty_list[item]["Country"]) if mapping: entry[const.ADIF] = int(mapping[cty_list[item]["Country"]]) entry[const.CQZ] = int(cty_list[item]["CQZone"]) entry[const.ITUZ] = int(cty_list[item]["ITUZone"]) - entry[const.CONTINENT] = str(cty_list[item]["Continent"]) + entry[const.CONTINENT] = unicode(cty_list[item]["Continent"]) entry[const.LATITUDE] = float(cty_list[item]["Latitude"]) entry[const.LONGITUDE] = float(cty_list[item]["Longitude"]) @@ -1193,7 +1467,7 @@ class LookupLib(object): elif item == const.WHITELIST: my_dict[item] = self._str_to_bool(my_dict[item]) else: - my_dict[item] = str(my_dict[item]) + my_dict[item] = unicode(my_dict[item]) return my_dict diff --git a/pyhamtools/qsl.py b/pyhamtools/qsl.py index f83f5c4..508b73d 100644 --- a/pyhamtools/qsl.py +++ b/pyhamtools/qsl.py @@ -5,7 +5,6 @@ import requests import redis from requests.exceptions import ConnectionError, HTTPError, Timeout - def get_lotw_users(**kwargs): """Download the latest inoffical list of `ARRL Logbook of the World (LOTW)`__ users which is provided on a weekly basis by HB9BZA_. Dates of the users last upload is added by WD5EAE_. @@ -17,6 +16,7 @@ def get_lotw_users(**kwargs): Raises: IOError: When network is unavailable, file can't be downloaded or processed + ValueError: Raised when data from file can't be read Example: The following example downloads the LOTW user list and check when DH1TW has made his last LOTW upload: @@ -30,7 +30,9 @@ def get_lotw_users(**kwargs): .. _HB9BZA: http://www.hb9bza.net/lotw-users-list .. _WD5EAE: http://www.wd5eae.org/HB9BZA_LoTWUsersList.html __ ARRL_ - """ + + """ + url = "" lotw = {} @@ -46,14 +48,21 @@ def get_lotw_users(**kwargs): except (ConnectionError, HTTPError, Timeout) as e: raise IOError(e) + error_count = 0 + if result.status_code == requests.codes.ok: for el in result.text.split(): data = el.split(",") - lotw[data[0]] = datetime.strptime(data[1], '%Y-%m-%d') - # print call + try: + lotw[data[0]] = datetime.strptime(data[1], '%Y-%m-%d') + except ValueError as e: + error_count += 1 + if error_count > 10: + raise ValueError("more than 10 wrongly formatted datasets " + str(e)) + else: raise IOError("HTTP Error: " + str(result.status_code)) - + return lotw def get_eqsl_users(**kwargs): diff --git a/pyhamtools/version.py b/pyhamtools/version.py index d8cb894..3431970 100644 --- a/pyhamtools/version.py +++ b/pyhamtools/version.py @@ -1,4 +1,4 @@ #VERSION = (0, 5, 0, 'dev') -VERSION = (0, 4, 2) +VERSION = (0, 5, 0) __release__ = ''.join(['-.'[type(x) == int]+str(x) for x in VERSION])[1:] __version__ = '.'.join((str(VERSION[0]), str(VERSION[1]))) diff --git a/test/fixtures/lotw_data_with_errors.html b/test/fixtures/lotw_data_with_errors.html new file mode 100644 index 0000000..381f9af --- /dev/null +++ b/test/fixtures/lotw_data_with_errors.html @@ -0,0 +1,58 @@ +1A0C,20-07-29 +1A0KM,20-02-08 +1A3A,20-09-12 +1A4A,20-09-16 +2A/DJ6AU,20-01-04 +2A0APF,20-11-23 +2A0APF/P,20-11-23 +2A0BQI,0000-10-03 +2A0BQI/P,20-10-03 +2A0BSM,20-12-31 +2A0MAV,20-11-23 +2C0TKX,20-05-15 +2C3SFC,2014-06-26 +2D0EBV/P,2006-10-26 +2D0YLX,2014-07-27 +2E0ADK,2014-02-18 +2E0ATS,2004-02-25 +2E0BBA,2010-08-19 +2E0BPP,2014-09-30 +2E0BXD,2011-12-29 +2E0BXO,2012-07-09 +2E0CAX,2006-07-11 +2E0CAX/P,2006-07-07 +2E0CHS,2008-12-05 +2E0CMD,2012-11-25 +2E0CMD/P,2012-11-25 +2E0CPJ,2013-03-22 +2E0CPT,2011-04-19 +2E0CQB,2014-06-14 +2E0CRY,2013-06-10 +2E0CXF,2014-05-24 +2E0DDG,2012-04-15 +2E0EBM,2014-07-21 +2E0EBV,2008-02-10 +2E0EBV/P,2006-07-03 +2E0EDL,2014-09-28 +2E0EET,2013-01-14 +2E0ETN,2012-06-06 +2E0ETT,2011-04-23 +2E0FAS,2014-08-31 +2E0FFQ,2008-12-10 +2E0FNG,2011-12-14 +2E0FSM,2014-09-19 +2E0GBC,2013-10-28 +2E0GBK,2014-07-31 +2E0GOL,2013-01-08 +2E0GSW,2013-12-28 +2E0GYC,2011-12-11 +2E0HEF,2014-08-26 +2E0HYE,2013-10-03 +2E0IAF,2014-09-28 +2E0IAF/P,2011-06-12 +2E0IFC,2014-09-28 +2E0IKW,2010-02-28 +2E0INV,2014-09-25 +2E0JAX,2013-05-01 +2E0JCA,2010-04-09 +2E0JCQ,2013-10-15 \ No newline at end of file diff --git a/test/test_callinfo.py b/test/test_callinfo.py index 36d8621..dbc5b34 100644 --- a/test/test_callinfo.py +++ b/test/test_callinfo.py @@ -47,7 +47,65 @@ response_prefix_C6A_countryfile = { 'ituz': 11 } +response_prefix_VK9NDX_countryfile = { + u'adif': 189, + u'continent': u'OC', + u'country': u'Norfolk Island', + u'cqz': 32, + u'ituz': 60, + u'latitude': -29.03, + u'longitude': -167.93 +} +response_prefix_VK9DNX_clublog = { + u'adif': 189, + u'continent': u'OC', + u'country': u'NORFOLK ISLAND', + u'cqz': 32, + u'latitude': -29.0, + u'longitude': -168.0 +} + +response_prefix_VK9DWX_clublog = { + u'adif': 303, + u'continent': u'OC', + u'country': u'WILLIS ISLAND', + u'cqz': 30, + u'latitude': -16.2, + u'longitude': -150.0 +} + +response_prefix_VK9DLX_clublog = { + u'adif': 147, + u'continent': u'OC', + u'country': u'LORD HOWE ISLAND', + u'cqz': 30, + u'latitude': -31.6, + u'longitude': -159.1 +} + +response_prefix_VK9DLX_countryfile = { + u'adif': 147, + u'continent': u'OC', + u'country': u'Lord Howe Island', + u'cqz': 30, + u'ituz': 60, + u'latitude': -31.55, + u'longitude': -159.08 +} + +response_prefix_VK9GMW_clublog = { + u'adif': 171, + u'continent': u'OC', + u'country': u'MELLISH REEF', + u'cqz': 30, + u'latitude': -17.6, + u'longitude': -155.8 +} + + + + response_Exception_VK9XO_with_start_date = { 'adif': 35, 'country': 'CHRISTMAS ISLAND', @@ -89,6 +147,18 @@ response_aircraft_mobile = { 'longitude': 0.0 } +response_callsign_exceptions_7QAA_clublog = { + u'adif': 440, + u'continent': u'AF', + u'country': u'MALAWI', + u'cqz': 37, + u'latitude': -14.9, + u'longitude': -34.4 +} + + + + class Test_callinfo_methods: def test_callinfo_iterate_prefix(self, fix_callinfo): @@ -126,7 +196,7 @@ class Test_callinfo_methods: def test_dismantle_callsign(self, fix_callinfo): if fix_callinfo._lookuplib._lookuptype == "clublogxml": - #assert fix_callinfo._dismantle_callsign("DH1TW/BCN")[const.BEACON] + assert fix_callinfo._dismantle_callsign("DH1TW/BCN")[const.BEACON] assert fix_callinfo._dismantle_callsign("DH1TW/QRP") == response_prefix_DH_clublog assert fix_callinfo._dismantle_callsign("DH1TW/QRPP") == response_prefix_DH_clublog assert fix_callinfo._dismantle_callsign("DH1TW/LH") == response_prefix_DH_clublog @@ -134,28 +204,51 @@ class Test_callinfo_methods: assert fix_callinfo._dismantle_callsign("DH1TW/P") == response_prefix_DH_clublog assert fix_callinfo._dismantle_callsign("DH1TW/5") == response_prefix_DH_clublog assert fix_callinfo._dismantle_callsign("DH1TW/M") == response_prefix_DH_clublog - #assert fix_callinfo._dismantle_callsign("DH1TW/B")[const.BEACON] + assert fix_callinfo._dismantle_callsign("DH1TW/B")[const.BEACON] assert fix_callinfo._dismantle_callsign("DH1TW") == response_prefix_DH_clublog assert fix_callinfo._dismantle_callsign("DL/HC2AO") == response_prefix_DH_clublog assert fix_callinfo._dismantle_callsign("9H5A/C6A") == response_prefix_C6A_clublog assert fix_callinfo._dismantle_callsign("C6A/9H5A") == response_prefix_C6A_clublog + assert fix_callinfo._dismantle_callsign("DH1TW/UNI") == response_prefix_DH_clublog + assert fix_callinfo._dismantle_callsign("DH1TW/BUX") == response_prefix_DH_clublog + assert fix_callinfo._dismantle_callsign("DH1TW/NOT") == response_prefix_DH_clublog + assert fix_callinfo._dismantle_callsign("VK9DLX/NOT") == response_prefix_VK9DLX_clublog + assert fix_callinfo._dismantle_callsign("7QAA") == response_callsign_exceptions_7QAA_clublog + + with pytest.raises(KeyError): + fix_callinfo._dismantle_callsign("OZ/JO85") if fix_callinfo._lookuplib._lookuptype == "countryfile": assert fix_callinfo._dismantle_callsign("DH1TW/QRP") == response_prefix_DH_countryfile assert fix_callinfo._dismantle_callsign("DH1TW/QRPP") == response_prefix_DH_countryfile - #assert fix_callinfo._dismantle_callsign("DH1TW/BCN")[const.BEACON] + assert fix_callinfo._dismantle_callsign("DH1TW/BCN")[const.BEACON] assert fix_callinfo._dismantle_callsign("DH1TW/LH") == response_prefix_DH_countryfile assert fix_callinfo._dismantle_callsign("HC2AO/DL") == response_prefix_DH_countryfile assert fix_callinfo._dismantle_callsign("DH1TW/P") == response_prefix_DH_countryfile assert fix_callinfo._dismantle_callsign("DH1TW/5") == response_prefix_DH_countryfile assert fix_callinfo._dismantle_callsign("DH1TW/M") == response_prefix_DH_countryfile - #assert fix_callinfo._dismantle_callsign("DH1TW/B")[const.BEACON] + assert fix_callinfo._dismantle_callsign("DH1TW/B")[const.BEACON] assert fix_callinfo._dismantle_callsign("DH1TW") == response_prefix_DH_countryfile assert fix_callinfo._dismantle_callsign("DL/HC2AO") == response_prefix_DH_countryfile assert fix_callinfo._dismantle_callsign("9H5A/C6A") == response_prefix_C6A_countryfile assert fix_callinfo._dismantle_callsign("C6A/9H5A") == response_prefix_C6A_countryfile + assert fix_callinfo._dismantle_callsign("DH1TW/NOT") == response_prefix_DH_countryfile + assert fix_callinfo._dismantle_callsign("VK9DLX/NOT") == response_prefix_VK9DLX_countryfile + + with pytest.raises(KeyError): + fix_callinfo._dismantle_callsign("OZ/JO85") + + + def test_dismantle_callsign_with_VK9_special_suffixes(self, fix_callinfo): + + if fix_callinfo._lookuplib._lookuptype == "clublog": + assert fix_callinfo._dismantle_callsign("VK9DNX") == response_prefix_VK9DNX_clublog + assert fix_callinfo._dismantle_callsign("VK9DLX") == response_prefix_VK9DLX_clublog + assert fix_callinfo._dismantle_callsign("VK9GMX") == response_prefix_VK9GMW_clublog + assert fix_callinfo._dismantle_callsign("VK9DWX") == response_prefix_VK9DWX_clublog + - def test_lookup_callsign(selfself, fix_callinfo): + def test_lookup_callsign(self, fix_callinfo): assert fix_callinfo._lookup_callsign("DH1TW/MM") == response_maritime_mobile assert fix_callinfo._lookup_callsign("DH1TW/AM") == response_aircraft_mobile diff --git a/test/test_eqsl.py b/test/test_eqsl.py index 424df89..baaef3b 100644 --- a/test/test_eqsl.py +++ b/test/test_eqsl.py @@ -7,7 +7,6 @@ from pyhamtools.qsl import get_eqsl_users class Test_eqsl_methods: - def test_check_content_with_mocked_http_server(self, httpserver): httpserver.serve_content(open('./fixtures/eqsl_data.html').read(), headers={'content-type': 'text/plain; charset=ISO-8859-1'}) diff --git a/test/test_lookuplib_clublogapi.py b/test/test_lookuplib_clublogapi.py index c16d6ad..7dedb27 100644 --- a/test/test_lookuplib_clublogapi.py +++ b/test/test_lookuplib_clublogapi.py @@ -10,8 +10,8 @@ from pyhamtools.exceptions import APIKeyMissingError response_Exception_DH1TW = { 'adif': 230, - 'country': 'FEDERAL REPUBLIC OF GERMANY', - 'continent': 'EU', + 'country': u'FEDERAL REPUBLIC OF GERMANY', + 'continent': u'EU', 'latitude': 51.0, 'longitude': -10.0, 'cqz': 14 @@ -19,8 +19,8 @@ response_Exception_DH1TW = { response_Exception_VU9KV = { 'adif': 324, - 'country': 'INDIA', - 'continent': 'AS', + 'country': u'INDIA', + 'continent': u'AS', 'latitude': 22.0, 'longitude': -80.0, 'cqz': 22 @@ -29,8 +29,8 @@ response_Exception_VU9KV = { response_Exception_VU9KV_with_Date = { 'adif': 11, - 'country': 'ANDAMAN & NICOBAR ISLANDS', - 'continent': 'AS', + 'country': u'ANDAMAN & NICOBAR ISLANDS', + 'continent': u'AS', 'latitude': 11.70, 'longitude': -92.80, 'cqz': 26 @@ -39,8 +39,8 @@ response_Exception_VU9KV_with_Date = { response_Exception_DH1TW_MM = { 'adif': 999, - 'country': 'MARITIME MOBILE', - 'continent': '', + 'country': u'MARITIME MOBILE', + 'continent': u'', 'latitude': 0.0, 'longitude': 0.0, 'cqz': 0 @@ -48,8 +48,8 @@ response_Exception_DH1TW_MM = { response_Exception_DH1TW_AM = { 'adif': 998, - 'country': 'AIRCRAFT MOBILE', - 'continent': '', + 'country': u'AIRCRAFT MOBILE', + 'continent': u'', 'longitude': 0.0, 'latitude': 0.0, 'cqz': 0 diff --git a/test/test_lookuplib_clublogxml.py b/test/test_lookuplib_clublogxml.py index fdc119a..bc9d352 100644 --- a/test/test_lookuplib_clublogxml.py +++ b/test/test_lookuplib_clublogxml.py @@ -15,19 +15,19 @@ UTC = pytz.UTC response_Entity_230 = { - 'country': 'FEDERAL REPUBLIC OF GERMANY', - 'continent': 'EU', + 'country': u'FEDERAL REPUBLIC OF GERMANY', + 'continent': u'EU', 'latitude': 51.0, 'longitude': -10.0, 'cqz': 14, - 'prefix' : 'DL', + 'prefix' : u'DL', 'deleted' : False, } response_Exception_KC6MM_1990 = { 'adif': 22, - 'country': 'PALAU', - 'continent': 'OC', + 'country': u'PALAU', + 'continent': u'OC', 'latitude': 9.50, 'longitude': -138.20, 'cqz': 27, @@ -35,8 +35,8 @@ response_Exception_KC6MM_1990 = { response_Exception_KC6MM_1992 = { 'adif': 22, - 'country': 'PALAU', - 'continent': 'OC', + 'country': u'PALAU', + 'continent': u'OC', 'latitude': 9.50, 'longitude': -138.20, 'cqz': 27, @@ -45,8 +45,8 @@ response_Exception_KC6MM_1992 = { response_Exception_VK9XX_with_end_date = { 'adif': 35, - 'country': 'CHRISTMAS ISLAND', - 'continent': 'OC', + 'country': u'CHRISTMAS ISLAND', + 'continent': u'OC', 'latitude': -10.50, 'longitude': -105.70, 'cqz': 29, @@ -54,8 +54,8 @@ response_Exception_VK9XX_with_end_date = { response_Exception_VK9XO_with_start_date = { 'adif': 35, - 'country': 'CHRISTMAS ISLAND', - 'continent': 'OC', + 'country': u'CHRISTMAS ISLAND', + 'continent': u'OC', 'latitude': -10.50, 'longitude': -105.70, 'cqz': 29, @@ -63,44 +63,44 @@ response_Exception_VK9XO_with_start_date = { response_Exception_AX9NYG = { 'adif': 38, - 'country': 'COCOS (KEELING) ISLAND', - 'continent': 'OC', + 'country': u'COCOS (KEELING) ISLAND', + 'continent': u'OC', 'latitude': -12.20, 'longitude': -96.80, 'cqz': 29, } response_Prefix_DH = { - 'country': 'FEDERAL REPUBLIC OF GERMANY', + 'country': u'FEDERAL REPUBLIC OF GERMANY', 'adif' : 230, - 'continent': 'EU', + 'continent': u'EU', 'latitude': 51.0, 'longitude': -10.0, 'cqz': 14, } response_Prefix_VK9_until_1975 = { - 'country': 'PAPUA TERR', + 'country': u'PAPUA TERR', 'adif' : 198, - 'continent': 'OC', + 'continent': u'OC', 'latitude': -9.40, 'longitude': -147.10, 'cqz': 28, } response_Prefix_VK9_starting_1976 = { - 'country': 'NORFOLK ISLAND', + 'country': u'NORFOLK ISLAND', 'adif' : 189, - 'continent': 'OC', + 'continent': u'OC', 'latitude': -29.00, 'longitude': -168.00, 'cqz': 32, } response_Prefix_ZD5_1964_to_1971 = { - 'country': 'SWAZILAND', + 'country': u'SWAZILAND', 'adif' : 468, - 'continent': 'AF', + 'continent': u'AF', 'latitude': -26.30, 'longitude': -31.10, 'cqz': 38, diff --git a/test/test_lookuplib_gettersetter_api.py b/test/test_lookuplib_gettersetter_api.py index e756ebe..86f4973 100644 --- a/test/test_lookuplib_gettersetter_api.py +++ b/test/test_lookuplib_gettersetter_api.py @@ -53,13 +53,13 @@ class Test_Getter_Setter_Api_Types_for_all_sources: count = 0 for attr in entity: if attr == "country": - assert type(entity[attr] is str) + assert type(entity[attr] is unicode) count +=1 if attr == "continent": - assert type(entity[attr] is str) + assert type(entity[attr] is unicode) count +=1 if attr == "prefix": - assert type(entity[attr] is str) + assert type(entity[attr] is unicode) count +=1 if attr == "deleted": assert type(entity[attr] is bool) @@ -109,10 +109,10 @@ class Test_Getter_Setter_Api_Types_for_all_sources: assert type(ex[attr]) is float count +=1 elif attr == "country": - assert type(ex[attr]) is str + assert type(ex[attr]) is unicode count +=1 elif attr == "continent": - assert type(ex[attr]) is str + assert type(ex[attr]) is unicode count +=1 elif attr == "cqz": assert type(ex[attr]) is int @@ -145,7 +145,7 @@ class Test_Getter_Setter_Api_Types_for_all_sources: count = 0 for attr in prefix: if attr == "country": - assert type(prefix[attr]) is str + assert type(prefix[attr]) is unicode count +=1 elif attr == "adif": assert type(prefix[attr]) is int @@ -157,7 +157,7 @@ class Test_Getter_Setter_Api_Types_for_all_sources: assert type(prefix[attr]) is int count +=1 elif attr == "continent": - assert type(prefix[attr]) is str + assert type(prefix[attr]) is unicode count +=1 elif attr == "latitude": assert type(prefix[attr]) is float diff --git a/test/test_lookuplib_qrz.py b/test/test_lookuplib_qrz.py new file mode 100644 index 0000000..f6764a8 --- /dev/null +++ b/test/test_lookuplib_qrz.py @@ -0,0 +1,242 @@ +import pytest +from datetime import datetime + + +from apikey import QRZ_USERNAME, QRZ_PWD +from pyhamtools.lookuplib import LookupLib +from pyhamtools.exceptions import APIKeyMissingError +from pyhamtools.consts import LookupConventions as const + +import pytz +UTC = pytz.UTC + +#Fixtures +#=========================================================== + +response_XX1XX = { +# 'u_views': u'17495', + u'biodate': datetime(2015, 2, 4, 17, 50, 32, tzinfo=UTC), + u'image': u'http://files.qrz.com/x/xx1xx/DSC_0094.png', + u'locator': u'KF05nx', + u'addr2': u'TEST CALLSIGN CITY', + u'addr1': u'DO NOT QSL', + u'aliases': [u'YY1YY'], + u'codes': u'TPS', + u'zipcode': u'010101', + u'lotw': True, + u'state': u'JC', + u'callsign': u'XX1XX', + u'fname': u'James W.', + u'latitude': -34.010735, + u'longitude': 21.164476, + u'email': u'trucker2345@easymail.com', + u'qslmgr': u'NO QSL - TEST CALLSIGN', + u'bio': u'10415', + u'ccode': 120, + u'geoloc': u'user', + u'eqsl': True, + u'mqsl': True, + u'adif': 134, + u'moddate': datetime(2015, 2, 4, 17, 53, 2, tzinfo=UTC), + u'license_class': u'z', + u'land': u'Kingman Reef', + u'imageinfo': u'425:640:425545', + u'name': 'Smith', + u'born': 2002, + u'country': u'Iceland', + u'user': u'XX1XX' +} + + +response_XX2XX = { + u'bio': u'93', + u'land': u'NON-DXCC', + u'adif': 0, + u'zipcode': u'23232', + u'country': u'Anguilla', + u'user': u'XX2XX', + u'moddate': datetime(2015, 3, 20, 23, 20, 37, tzinfo=UTC), + u'lotw': False, + u'ccode': 9, + u'geoloc': u'dxcc', + u'state': u'GA', + u'eqsl': False, + u'addr2': u'Las Vegas', +# 'u_views': u'23', + u'fname': u'NO', + u'addr1': u'123 Main Stod\u00DFer', + u'callsign': u'XX2XX', + u'mqsl': False, + u'biodate': datetime(2015, 2, 19, 22, 30, 2, tzinfo=UTC), + u'image': u'http://files.qrz.com/x/xx2xx/oval_bumper_sticker4.png', + u'imageinfo': u'285:500:44218' +} + +response_XX3XX = { +# 'u_views': u'4698', + u'biodate': datetime(2014, 8, 13, 15, 34, 57, tzinfo=UTC), + u'image': u'http://files.qrz.com/x/xx3xx/IMG_8813.JPG', + u'locator': u'FO51sj', + u'addr2': u'Shady Circle Roads', + u'addr1': u'1234 Main St.3', + u'aliases': [u'XX3XX/W7'], + u'zipcode': u'00033', + u'lotw': False, + u'state': u'JJ', + u'callsign': u'XX3XX', + u'fname': u'TEST\xc3\x9c\xc3\x9f\xc3\xb8x', + u'latitude': 51.396953, + u'email': u'fred@qrz.com', + u'qslmgr': u'Via BURO or AA7BQ', + u'bio': u'2420', + u'ccode': 130, + u'geoloc': u'user', + u'eqsl': False, + u'user': u'KF7WIS', + u'adif': 79, + u'moddate': datetime(2014, 6, 6, 23, 0, 45, tzinfo=UTC), + u'license_class': u'3', + u'land': u'Guadeloupe', + u'imageinfo': u'540:799:101014', + u'name': u'CALLSIGN3', + u'born': 2010, + u'country': u'Jamaica', + u'longitude': -68.41959, + u'mqsl': False +} + +response_XX4XX = { +# 'u_views': u'7980', + u'biodate': datetime(2014, 9, 17, 19, 46, 54, tzinfo=UTC), + u'image': u'http://files.qrz.com/x/xx4xx/IMG_0032.JPG', + u'locator': u'DM79mp', + u'addr2': u'Getamap and Findit', + u'addr1': u'Test Callsign for QRZ', + u'imageinfo': u'1200:1600:397936', + u'lotw': False, + u'state': u'ZZ', + u'callsign': u'XX4XX', + u'fname': u'Arthur', + u'latitude': 39.645, + u'iota': u'NA-075', + u'qslmgr': u'NO QSL - TEST CALLSIGN', + u'bio': u'785', + u'ccode': 34, + u'geoloc': u'user', + u'eqsl': False, + u'user': u'XX2XX', + u'adif': 64, + u'moddate': datetime(2014, 3, 28, 20, 29, 42, tzinfo=UTC), + u'name': u'Fay', + u'land': u'Bermuda', + u'zipcode': u'12345', + u'country': u'Bermuda', + u'longitude': -104.96, + u'mqsl': False +} + +response_333 = { + const.COUNTRY: u'Iraq', + u'cc': u'IQ', + const.LONGITUDE: 44.362793, + const.CQZ: 21, + const.ITUZ: 39, + const.LATITUDE: 33.358062, + u'timezone': 3.0, + const.ADIF: 333, + const.CONTINENT: u'AS', + u'ccc': u'IRQ' +} + +#TESTS +#=========================================================== + + +class TestQrzConstructur: + + def test_get_session_key(self): + lib = LookupLib(lookuptype="qrz", username=QRZ_USERNAME, pwd=QRZ_PWD) + assert len(lib._apikey) == 32 + + def test_get_session_key_with_invalid_username(self): + with pytest.raises(ValueError): + lib = LookupLib(lookuptype="qrz", username="hello", pwd=QRZ_PWD) + + def test_get_session_key_with_invalid_password(self): + with pytest.raises(ValueError): + lib = LookupLib(lookuptype="qrz", username=QRZ_USERNAME, pwd="hello") + + def test_get_session_key_with_empty_username_and_password(self): + with pytest.raises(ValueError): + lib = LookupLib(lookuptype="qrz", username="", pwd="") + + +class TestQrz_Callsign_Lookup: + + def test_lookup_callsign(self, fix_qrz): + data = fix_qrz._lookup_qrz_callsign("xx1xx", fix_qrz._apikey) + data.pop('u_views', None) + assert data == response_XX1XX #check content + assert len(data) == len(response_XX1XX) #ensure all fields are included + + data = fix_qrz._lookup_qrz_callsign("XX1XX", fix_qrz._apikey) + data.pop('u_views', None) + assert data == response_XX1XX + + data = fix_qrz._lookup_qrz_callsign("XX2XX", fix_qrz._apikey) + data.pop('u_views', None) + assert data == response_XX2XX + assert len(data) == len(response_XX2XX) + + data = fix_qrz._lookup_qrz_callsign("XX3XX", fix_qrz._apikey) + data.pop('u_views', None) + assert data == response_XX3XX + assert len(data) == len(response_XX3XX) + + data = fix_qrz._lookup_qrz_callsign("XX4XX", fix_qrz._apikey) + data.pop('u_views', None) + assert data == response_XX4XX + assert len(data) == len(response_XX4XX) + + def test_lookup_callsign_with_unicode_escaping(self, fix_qrz): + data = fix_qrz._lookup_qrz_callsign("XX2XX", fix_qrz._apikey) + data.pop('u_views', None) + assert data == response_XX2XX + + def test_lookup_callsign_does_not_exist(self, fix_qrz): + with pytest.raises(KeyError): + fix_qrz._lookup_qrz_callsign("XX8XX", fix_qrz._apikey) + + def test_lookup_callsign_with_empty_input(self, fix_qrz): + with pytest.raises(ValueError): + fix_qrz._lookup_qrz_callsign("", fix_qrz._apikey) + + def test_lookup_callsign_with_invalid_input(self, fix_qrz): + with pytest.raises(AttributeError): + fix_qrz._lookup_qrz_callsign(3, fix_qrz._apikey) + + +class TestQrz_DXCC_Lookup: + + def test_lookup_dxcc_with_int(self, fix_qrz): + data = fix_qrz._lookup_qrz_dxcc(333, fix_qrz._apikey) + assert data == response_333 #check content + assert len(data) == len(response_333) #ensure all fields are included + + def test_lookup_dxcc_with_string(self, fix_qrz): + data = fix_qrz._lookup_qrz_dxcc("333", fix_qrz._apikey) + assert data == response_333 #check content + assert len(data) == len(response_333) #ensure all fields are included + + def test_lookup_dxcc_does_not_exist(self, fix_qrz): + with pytest.raises(KeyError): + fix_qrz._lookup_qrz_dxcc('854', fix_qrz._apikey) + + def test_lookup_dxcc_wrong_input(self, fix_qrz): + with pytest.raises(ValueError): + fix_qrz._lookup_qrz_dxcc('', fix_qrz._apikey) + + def test_lookup_dxcc(self, fix_qrz): + data = fix_qrz.lookup_entity(333) + assert data == response_333 #check content + \ No newline at end of file diff --git a/test/test_lotw.py b/test/test_lotw.py index 52379eb..5afd018 100644 --- a/test/test_lotw.py +++ b/test/test_lotw.py @@ -26,4 +26,11 @@ class Test_lotw_methods: with pytest.raises(IOError): get_lotw_users(url="http://wd5eae.org/LoTW_Data_XXXXX.txt") + def test_with_more_than_10_invalid_dates(self, httpserver): + httpserver.serve_content(open('./fixtures/lotw_data_with_errors.html').read()) + + with pytest.raises(ValueError): + get_lotw_users(url=httpserver.url) + + \ No newline at end of file diff --git a/tox.ini b/tox.ini index 8f93aa7..260ef61 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ envlist = py26,py27,pypy [testenv] +#deps=-rtox_requirements.txt deps=pytest commands = py.test \ diff --git a/tox_requirements.txt b/tox_requirements.txt new file mode 100644 index 0000000..b7ebc90 --- /dev/null +++ b/tox_requirements.txt @@ -0,0 +1,5 @@ +pyephem (3.7.5.3) +Pygments (1.6) +pytz (2014.2) +redis (2.10.3) +requests (2.2.1)