Improve formatting

Author: rliebz

dataverse/connection.py

@@ -15,11 +15,8 @@ def __init__(self, host, token=None, username=None, password=None):
         self.password = password
         self.host = host
         self.sd_uri = "https://{host}/dvn/api/data-deposit/v1.1/swordv2/service-document".format(host=self.host)
-        
-        # Connection Status and SWORD Properties
-        self.status = None
-        self.connected = False
         self.service_document = None
+        self.connected = False
 
         self.connect()
 
@@ -39,8 +36,8 @@ def connect(self):
         elif resp.status_code != 200:
             raise DataverseError('Could not connect to the Dataverse')
 
-        self.connected = True
         self.service_document = etree.XML(resp.content)
+        self.connected = True
 
     def get_dataverses(self, refresh=False, allow_root=False):
         if refresh:

dataverse/dataset.py

@@ -143,13 +143,11 @@ def get_state(self, refresh=False):
         return self._state
 
     def get_file(self, file_name, published=False):
-
         # Search published dataset if specified; otherwise, search draft
         files = self.get_published_files() if published else self.get_files()
         return next((f for f in files if f.name == file_name), None)
 
     def get_file_by_id(self, file_id, published=False):
-
         # Search published dataset if specified; otherwise, search draft
         files = self.get_published_files() if published else self.get_files()
         return next((f for f in files if f.id == file_id), None)
@@ -158,22 +156,16 @@ def get_files(self, published=False, refresh=True):
         if published:
             return self.get_published_files()
 
-        return [
-            DataverseFile.from_statement(resource, self)
-            for resource in get_elements(self.get_statement(refresh), 'entry')
-        ]
+        elements = get_elements(self.get_statement(refresh), 'entry')
+        return [DataverseFile.from_statement(element, self)
+                for element in elements]
 
     def get_published_files(self):
-        """
-        Uses data sharing API to retrieve a list of files from the most
-        recently published version of the dataset
-        """
         metadata_url = 'https://{0}/dvn/api/metadata/{1}'.format(
             self.connection.host, self.doi
         )
         xml = requests.get(metadata_url, auth=self.connection.auth).content
         elements = get_elements(xml, tag='otherMat')
-
         return [DataverseFile.from_metadata(element, self)
                 for element in elements]
 

dataverse/dataverse.py

@@ -53,7 +53,6 @@ def publish(self):
             raise DataverseError('The Dataverse could not be published.')
 
     def add_dataset(self, dataset):
-
         if get_element(dataset._entry, 'title', 'dcterms') is None:
             raise InsufficientMetadataError('This dataset must have a title.')
         if get_element(dataset._entry, 'description', 'dcterms') is None:
@@ -75,7 +74,6 @@ def add_dataset(self, dataset):
         dataset._refresh(receipt=resp.content)
 
     def delete_dataset(self, dataset):
-
         if dataset._state == 'DELETED' or dataset._state == 'DEACCESSIONED':
             return
 

dataverse/file.py

@@ -26,20 +26,6 @@ def __init__(self, name, dataset, edit_media_uri=None, download_url=None):
                 'Files must have an edit media uri or download url.'
             )
 
-    def __repr__(self):
-        return """
-    DATAVERSE FILE:
-    Name: {0}
-    Id: {1}
-    Download URL: {2}
-    Status: {3}
-    """.format(
-            self.name,
-            self.id,
-            self.download_url,
-            'PUBLISHED' if self.is_published else 'DRAFT',
-        )
-
     @classmethod
     def from_statement(cls, element, dataset):
         edit_media_uri = get_element(element, 'content').get('src')