From e54803799068f1acfc9949b874f935e5f2f57eb3 Mon Sep 17 00:00:00 2001 From: Dalen Kruse Date: Tue, 30 Nov 2021 17:02:41 -0800 Subject: [PATCH 1/2] Added .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build From 507665473a890656f4029b8c817746efac425878 Mon Sep 17 00:00:00 2001 From: Dalen Kruse Date: Tue, 30 Nov 2021 17:27:39 -0800 Subject: [PATCH 2/2] Updated SATNOGs db fetch script to work with Python 3 Fixes #98. Changes include using correct urllib, updating sorted function call, and ensuring temp files are opened in text mode. --- utils/fetch_satnogs_db.py.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/fetch_satnogs_db.py.in b/utils/fetch_satnogs_db.py.in index e456a86..e891dcc 100755 --- a/utils/fetch_satnogs_db.py.in +++ b/utils/fetch_satnogs_db.py.in @@ -1,10 +1,10 @@ #!/usr/bin/env python #This is a script that fetches transponder data from db.satnogs.org and parses it to flyby transponder data. -import urllib2 import json import sys import tempfile +from urllib.request import urlopen from distutils import spawn from subprocess import call from operator import itemgetter @@ -21,16 +21,16 @@ else: sys.exit(); #Step 1: Fetch JSON transponder information from SatNOGS db. -request = urllib2.urlopen("https://db.satnogs.org/api/transmitters") +request = urlopen("https://db.satnogs.org/api/transmitters") data = json.load(request) # Order data by norad_cat_id entry -sorteddata = sorted(data, key=itemgetter('norad_cat_id')) +sorteddata = sorted(data, key=lambda x: x['norad_cat_id'] or 0) # Open output file db = None; if not named_file: - db = tempfile.NamedTemporaryFile(); + db = tempfile.NamedTemporaryFile(mode='w+t') else: db = open(named_file, "w");