Merge branch 'master' of https://github.com/IQSS/dataverse-client-python into feature/pull_upstream_nested_dataverses

pattisdr · pattisdr · commit 84a331743ccf · 2019-03-13T10:33:37.000-05:00
diff --git a/dataverse/dataset.py b/dataverse/dataset.py
@@ -98,14 +98,15 @@ def id(self):
             raise NoContainerError('This dataset has not been added to a Dataverse.')
 
         for dataset in self.dataverse.get_contents(refresh=True):
-            doi = '{0}:{1}/{2}'.format(
-                dataset['protocol'],
-                dataset['authority'],
-                dataset['identifier'],
-            )
-            if doi == self.doi:
-                self._id = dataset['id']
-                return self._id
+            if dataset['type'] == 'dataset':
+                doi = '{0}:{1}/{2}'.format(
+                    dataset['protocol'],
+                    dataset['authority'],
+                    dataset['identifier'],
+                )
+                if doi == self.doi:
+                    self._id = dataset['id']
+                    return self._id
 
         raise MetadataNotFoundError('The dataset ID could not be found.')
 
diff --git a/dataverse/test/test_dataverse.py b/dataverse/test/test_dataverse.py
@@ -292,6 +292,19 @@ def test_add_dataset_from_xml(self):
         assert retrieved_dataset
         self.dataverse.delete_dataset(retrieved_dataset)
 
+    def test_id_property(self):
+        alias = str(uuid.uuid1())
+        # Creating a dataverse within a dataverse
+        self.connection.create_dataverse(
+            alias,
+            'Sub Dataverse',
+            'dataverse@example.com',
+            self.alias,
+        )
+        sub_dataverse = self.connection.get_dataverse(alias, True)
+        assert self.dataset.id == self.dataset._id
+        self.connection.delete_dataverse(sub_dataverse)
+
     def test_add_files(self):
         self.dataset.upload_filepaths(EXAMPLE_FILES)
         actual_files = [f.name for f in self.dataset.get_files()]
diff --git a/readme.md b/readme.md
@@ -1,5 +1,7 @@
 ## Dataverse API Client
 
+**PLEASE NOTE: This library is maintained by the Dataverse community, not IQSS.**
+
 This is a library for writing Python applications that make use of Dataverse
 APIs v4.0.  The intent is to publish the python client on https://pypi.python.org.
 
