Update variable names to 4.0

Author: rliebz

dataverse/dataverse.py

@@ -82,13 +82,13 @@ def delete_dataset(self, dataset):
             auth=self.connection.auth,
         )
         if resp.status_code == 405:
-            raise MethodNotAllowedError('Published studies can only be '
+            raise MethodNotAllowedError('Published datasets can only be '
                 'deleted from the GUI. For more information, please refer to '
                 'https://github.com/IQSS/dataverse/issues/778')
 
         dataset._state = 'DEACCESSIONED'
 
-    def get_studies(self):
+    def get_datasets(self):
 
         collection_info = requests.get(
             self.collection.get('href'),
@@ -99,10 +99,10 @@ def get_studies(self):
         return [Dataset.from_dataverse(entry, self) for entry in entries]
 
     def get_dataset_by_doi(self, doi):
-        return next((s for s in self.get_studies() if s.doi == doi), None)
+        return next((s for s in self.get_datasets() if s.doi == doi), None)
 
     def get_dataset_by_title(self, title):
-        return next((s for s in self.get_studies() if s.title == title), None)
+        return next((s for s in self.get_datasets() if s.title == title), None)
 
     def get_dataset_by_string_in_entry(self, string):
-        return next((s for s in self.get_studies() if string in s.get_entry()), None)
+        return next((s for s in self.get_datasets() if string in s.get_entry()), None)

dataverse/test/test_dataverse.py

@@ -104,9 +104,9 @@ def setUpClass(self):
 
         self.dv = dataverses[0]
 
-        print "Removing any existing studies."
-        studies = self.dv.get_studies()
-        for dataset in studies :
+        print "Removing any existing datasets."
+        datasets = self.dv.get_datasets()
+        for dataset in datasets:
             if dataset.get_state() != 'DEACCESSIONED':
                 self.dv.delete_dataset(dataset)
         print 'Dataverse emptied.'
@@ -182,13 +182,13 @@ def test_delete_a_dataset(self):
         atomDataset = self.dv.get_dataset_by_title("Roasting at Home")
         self.assertTrue(atomDataset)
 
-        startingNumberOfStudies = len(self.dv.get_studies())
-        self.assertTrue(startingNumberOfStudies > 0)
+        num_datasets = len(self.dv.get_datasets())
+        self.assertTrue(num_datasets > 0)
         self.dv.delete_dataset(atomDataset)
         self.assertEqual(atomDataset.get_state(refresh=True), 'DEACCESSIONED')
-        self.assertEqual(len(self.dv.get_studies()), startingNumberOfStudies - 1)
+        self.assertEqual(len(self.dv.get_datasets()), num_datasets - 1)
 
-    @unittest.skip('Published studies can no longer be deaccessioned via API')
+    @unittest.skip('Published datasets can no longer be deaccessioned via API')
     def test_publish_dataset(self):
         self.assertTrue(self.s.get_state() == "DRAFT")
         self.s.publish()