Merge 0b5aebc into d82d021

gbif · May 26, 2020 · 1352c35 · 1352c35
2 parents d82d021 + 0b5aebc
commit 1352c35
Show file tree

Hide file tree

Showing 22 changed files with 222 additions and 242 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -14,7 +14,6 @@
 
 import sys
 import os
-import shlex
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

diff --git a/docs/contributors.rst b/docs/contributors.rst
@@ -8,3 +8,4 @@ Contributors
 * `Jan Legind <https://github.com/jlegind>`_
 * `Stijn Van Hoey <https://github.com/stijnvanhoey>`_
 * `Peter Desmet <https://github.com/peterdesmet>`_
+* `Nicolas Noé <https://github.com/niconoe>`_
diff --git a/pygbif/occurrences/download.py b/pygbif/occurrences/download.py
@@ -1,5 +1,4 @@
 import os
-import re
 import csv
 import json
 import datetime

diff --git a/pygbif/occurrences/get.py b/pygbif/occurrences/get.py
@@ -59,7 +59,3 @@ def get_fragment(key, **kwargs):
     url = gbif_baseurl + "occurrence/" + str(key) + "/fragment"
     out = gbif_GET(url, {}, **kwargs)
     return out
-
-
-def get_url():
-    "http://www.gbif.org/occurrence/" + x
diff --git a/pygbif/occurrences/search.py b/pygbif/occurrences/search.py
@@ -1,4 +1,3 @@
-import re
 from ..gbifutils import *
 
 

diff --git a/pygbif/registry/datasets.py b/pygbif/registry/datasets.py
diff --git a/pygbif/species/name_usage.py b/pygbif/species/name_usage.py
@@ -16,65 +16,65 @@ def name_usage(
     **kwargs
 ):
     """
-	Lookup details for specific names in all taxonomies in GBIF.
-
-	:param key: [fixnum] A GBIF key for a taxon
-	:param name: [str] Filters by a case insensitive, canonical namestring,
-		 e.g. 'Puma concolor'
-	:param data: [str] The type of data to get. Default: ``all``. Options: ``all``,
-		``verbatim``, ``name``, ``parents``, ``children``,
-		``related``, ``synonyms``, ``descriptions``, ``distributions``, ``media``,
-		``references``, ``speciesProfiles``, ``vernacularNames``, ``typeSpecimens``,
-		``root``
-	:param language: [str] Language, default is english
-	:param datasetKey: [str] Filters by the dataset's key (a uuid)
-	:param uuid: [str] A uuid for a dataset. Should give exact same results as datasetKey.
-	:param sourceId: [fixnum] Filters by the source identifier.
-	:param rank: [str] Taxonomic rank. Filters by taxonomic rank as one of:
-			``CLASS``, ``CULTIVAR``, ``CULTIVAR_GROUP``, ``DOMAIN``, ``FAMILY``, ``FORM``, ``GENUS``, ``INFORMAL``,
-			``INFRAGENERIC_NAME``, ``INFRAORDER``, ``INFRASPECIFIC_NAME``, ``INFRASUBSPECIFIC_NAME``,
-			``KINGDOM``, ``ORDER``, ``PHYLUM``, ``SECTION``, ``SERIES``, ``SPECIES``, ``STRAIN``, ``SUBCLASS``, ``SUBFAMILY``,
-			``SUBFORM``, ``SUBGENUS``, ``SUBKINGDOM``, ``SUBORDER``, ``SUBPHYLUM``, ``SUBSECTION``, ``SUBSERIES``,
-			``SUBSPECIES``, ``SUBTRIBE``, ``SUBVARIETY``, ``SUPERCLASS``, ``SUPERFAMILY``, ``SUPERORDER``,
-			``SUPERPHYLUM``, ``SUPRAGENERIC_NAME``, ``TRIBE``, ``UNRANKED``, ``VARIETY``
-	:param shortname: [str] A short name..need more info on this?
-	:param limit: [fixnum] Number of records to return. Default: ``100``. Maximum: ``1000``. (optional)
-	:param offset: [fixnum] Record number to start at. (optional)
-
-	References: http://www.gbif.org/developer/species#nameUsages
-
-	Usage::
-
-			from pygbif import species
-
-			species.name_usage(key=1)
-
-			# Name usage for a taxonomic name
-			species.name_usage(name='Puma', rank="GENUS")
-
-			# All name usages
-			species.name_usage()
-
-			# References for a name usage
-			species.name_usage(key=2435099, data='references')
-
-			# Species profiles, descriptions
-			species.name_usage(key=3119195, data='speciesProfiles')
-			species.name_usage(key=3119195, data='descriptions')
-			species.name_usage(key=2435099, data='children')
-
-			# Vernacular names for a name usage
-			species.name_usage(key=3119195, data='vernacularNames')
-
-			# Limit number of results returned
-			species.name_usage(key=3119195, data='vernacularNames', limit=3)
-
-			# Search for names by dataset with datasetKey parameter
-			species.name_usage(datasetKey="d7dddbf4-2cf0-4f39-9b2a-bb099caae36c")
-
-			# Search for a particular language
-			species.name_usage(key=3119195, language="FRENCH", data='vernacularNames')
-	"""
+    Lookup details for specific names in all taxonomies in GBIF.
+
+    :param key: [fixnum] A GBIF key for a taxon
+    :param name: [str] Filters by a case insensitive, canonical namestring,
+         e.g. 'Puma concolor'
+    :param data: [str] The type of data to get. Default: ``all``. Options: ``all``,
+        ``verbatim``, ``name``, ``parents``, ``children``,
+        ``related``, ``synonyms``, ``descriptions``, ``distributions``, ``media``,
+        ``references``, ``speciesProfiles``, ``vernacularNames``, ``typeSpecimens``,
+        ``root``
+    :param language: [str] Language, default is english
+    :param datasetKey: [str] Filters by the dataset's key (a uuid)
+    :param uuid: [str] A uuid for a dataset. Should give exact same results as datasetKey.
+    :param sourceId: [fixnum] Filters by the source identifier.
+    :param rank: [str] Taxonomic rank. Filters by taxonomic rank as one of:
+            ``CLASS``, ``CULTIVAR``, ``CULTIVAR_GROUP``, ``DOMAIN``, ``FAMILY``, ``FORM``, ``GENUS``, ``INFORMAL``,
+            ``INFRAGENERIC_NAME``, ``INFRAORDER``, ``INFRASPECIFIC_NAME``, ``INFRASUBSPECIFIC_NAME``,
+            ``KINGDOM``, ``ORDER``, ``PHYLUM``, ``SECTION``, ``SERIES``, ``SPECIES``, ``STRAIN``, ``SUBCLASS``, ``SUBFAMILY``,
+            ``SUBFORM``, ``SUBGENUS``, ``SUBKINGDOM``, ``SUBORDER``, ``SUBPHYLUM``, ``SUBSECTION``, ``SUBSERIES``,
+            ``SUBSPECIES``, ``SUBTRIBE``, ``SUBVARIETY``, ``SUPERCLASS``, ``SUPERFAMILY``, ``SUPERORDER``,
+            ``SUPERPHYLUM``, ``SUPRAGENERIC_NAME``, ``TRIBE``, ``UNRANKED``, ``VARIETY``
+    :param shortname: [str] A short name..need more info on this?
+    :param limit: [fixnum] Number of records to return. Default: ``100``. Maximum: ``1000``. (optional)
+    :param offset: [fixnum] Record number to start at. (optional)
+
+    References: http://www.gbif.org/developer/species#nameUsages
+
+    Usage::
+
+            from pygbif import species
+
+            species.name_usage(key=1)
+
+            # Name usage for a taxonomic name
+            species.name_usage(name='Puma', rank="GENUS")
+
+            # All name usages
+            species.name_usage()
+
+            # References for a name usage
+            species.name_usage(key=2435099, data='references')
+
+            # Species profiles, descriptions
+            species.name_usage(key=3119195, data='speciesProfiles')
+            species.name_usage(key=3119195, data='descriptions')
+            species.name_usage(key=2435099, data='children')
+
+            # Vernacular names for a name usage
+            species.name_usage(key=3119195, data='vernacularNames')
+
+            # Limit number of results returned
+            species.name_usage(key=3119195, data='vernacularNames', limit=3)
+
+            # Search for names by dataset with datasetKey parameter
+            species.name_usage(datasetKey="d7dddbf4-2cf0-4f39-9b2a-bb099caae36c")
+
+            # Search for a particular language
+            species.name_usage(key=3119195, language="FRENCH", data='vernacularNames')
+    """
     args = {
         "language": language,
         "name": name,

diff --git a/test/test-maps-map.py b/test/test-maps-map.py
@@ -1,7 +1,6 @@
 """Tests for maps module - maps"""
 from nose.tools import *
 import unittest
-import os
 import vcr
 import requests
 import matplotlib

diff --git a/test/test-occurrences-count.py b/test/test-occurrences-count.py
@@ -1,5 +1,4 @@
 """Tests for occurrences module - count methods"""
-import os
 import vcr
 from pygbif import occurrences
 

diff --git a/test/test-occurrences-download_get.py b/test/test-occurrences-download_get.py
@@ -1,5 +1,4 @@
 """Tests for occurrences module - download_get methods"""
-import os
 from pygbif import occurrences as occ
 
 

diff --git a/test/test-occurrences-get.py b/test/test-occurrences-get.py
@@ -1,5 +1,4 @@
 """Tests for occurrences module - get methods"""
-import os
 import vcr
 from pygbif import occurrences
 

diff --git a/test/test-occurrences-search.py b/test/test-occurrences-search.py
@@ -1,5 +1,4 @@
 """Tests for occurrences module - search methods"""
-import os
 import vcr
 from pygbif import occurrences
 

diff --git a/test/test-registry-dataset_metrics.py b/test/test-registry-dataset_metrics.py
@@ -1,5 +1,4 @@
 """Tests for registry module - dataset_metrics method"""
-import os
 import vcr
 from pygbif import registry
 

diff --git a/test/test-registry-datasets.py b/test/test-registry-datasets.py
@@ -1,5 +1,4 @@
 """Tests for registry module - datasets method"""
-import os
 import vcr
 from pygbif import registry
 

diff --git a/test/test-registry-installations.py b/test/test-registry-installations.py
@@ -1,6 +1,6 @@
 """Tests for registry module - installations methods"""
-import os
 import vcr
+
 from pygbif import registry
 
 

diff --git a/test/test-registry-networks.py b/test/test-registry-networks.py
@@ -1,5 +1,4 @@
 """Tests for registry module - networks"""
-import os
 import vcr
 from pygbif import registry
 

diff --git a/test/test-registry-nodes.py b/test/test-registry-nodes.py
@@ -1,6 +1,6 @@
 """Tests for registry module - nodes methods"""
-import os
 import vcr
+
 from pygbif import registry
 
 

diff --git a/test/test-registry-organizations.py b/test/test-registry-organizations.py
@@ -1,5 +1,4 @@
 """Tests for registry module - organizations"""
-import os
 import vcr
 from pygbif import registry
 

diff --git a/test/test-species-name_backbone.py b/test/test-species-name_backbone.py
@@ -1,5 +1,4 @@
 """Tests for species module - name_backbone methods"""
-import os
 import vcr
 from pygbif import species
 

diff --git a/test/test-species-name_lookup.py b/test/test-species-name_lookup.py
@@ -1,5 +1,4 @@
 """Tests for species module - name_lookup methods"""
-import os
 import vcr
 from pygbif import species
 

diff --git a/test/test-species-name_suggest.py b/test/test-species-name_suggest.py
@@ -1,5 +1,4 @@
 """Tests for species module - name_suggest methods"""
-import os
 import vcr
 import re
 from pygbif import species

diff --git a/test/test-species-name_usage.py b/test/test-species-name_usage.py
@@ -1,5 +1,4 @@
 """Tests for species module - name_usage methods"""
-import os
 import vcr
 from pygbif import species