Python3 support and configurable endpoint #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kipparker
commented
Apr 11, 2023
Comment on lines
+21
to
+23
| ## Usage | ||
|
|
||
| Create a new harvest source of type "Socrata" and enter the URL of the Socrata catalog you want to harvest from. The default base url to retrieve catalogues is "https://api.us.socrata.com/api/catalog/v1". You can provide a config object to the harvester to change this base url. For example: |
There was a problem hiding this comment.
Document the new configuration option
Comment on lines
+7
to
+18
|
|
||
| try: | ||
| from urllib.parse import urlparse | ||
| except ImportError: | ||
| from urlparse import urlparse | ||
|
|
||
| try: | ||
| from json import JSONDecodeError | ||
| except ImportError: | ||
| from simplejson.scanner import JSONDecodeError | ||
|
|
||
|
|
There was a problem hiding this comment.
Python 3 imports with python 2 fallbacks
Comment on lines
+222
to
+231
| def _set_config(self, config_str): | ||
| self.config = {'base_api_endpoint':BASE_API_ENDPOINT} | ||
| if config_str: | ||
| self.config = json.loads(config_str) | ||
| if 'base_api_endpoint' in self.config: | ||
| self.base_api_endpoint = self.config['base_api_endpoint'] | ||
|
|
||
| log.debug('Using config: %r', self.config) | ||
|
|
||
| def validate_config(self, config): |
There was a problem hiding this comment.
Allows base_api_endpoint to be configured
| @@ -266,8 +298,9 @@ def _page_datasets(domain, batch_number): | |||
| _request_datasets_from_socrata(domain, batch_number, | |||
| current_offset) | |||
| if datasets is None or len(datasets) == 0: | |||
| raise StopIteration | |||
| break | |||
There was a problem hiding this comment.
Using a break here rather than raising an error, so imports can continue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a couple of small changes to make the plugin work with python 3. We also needed to be able to change the endpoint the harvester uses (the datasets we wanted were on the .eu version), so
base_api_endpointhas been added as a configuration option.I can see the repo hasn't been updated for a while! But it only took small changes to get this working, and if we need it someone else might, so hopefully this pull request is useful