Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pypsg/psg.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import requests
from pkg_resources import resource_string
from importlib import resources
from io import StringIO
from collections import OrderedDict
import re
Expand All @@ -19,7 +19,10 @@ def __init__(self, server_url='https://psg.gsfc.nasa.gov/api.php',
with open(default_config, "r") as foo:
self.default_config_str = foo.read()
else:
self.default_config_str = resource_string(__name__, default_config).decode('utf-8')
parent_directory = os.path.dirname(default_config)
file_name = os.path.basename(default_config)
self.default_config_posix = resources.files(parent_directory).joinpath(file_name)
self.default_config_str = self.default_config_posix.read_text()
self.default_config = self.config_str_to_dict(self.default_config_str)

print('Testing connection to PSG at {} ...'.format(self._server_url))
Expand Down