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

mfraezz · mfraezz · commit 5f20ad7aba11 · 2016-09-19T13:33:02.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 
 python:
-  - 2.6
   - 2.7
   - 3.3
   #- 3.4 # "No output has been received in the last 10 minutes, this potentially indicates a stalled build or something wrong with the build itself."
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -0,0 +1,8 @@
+.. :changelog:
+
+Release History
+---------------
+
+0.1.2 (2016-6-13)
+++++++++++++++++++
+- Allow use of a non-https connection.
diff --git a/dataverse/connection.py b/dataverse/connection.py
@@ -11,11 +11,15 @@
 
 class Connection(object):
 
-    def __init__(self, host, token):
+    def __init__(self, host, token, use_https=True):
         self.token = token
         self.host = host
 
-        self.base_url = 'https://{0}'.format(self.host)
+        if use_https:
+            url_scheme = 'https://'
+        else:
+            url_scheme = 'http://'
+        self.base_url = '{0}{1}'.format(url_scheme, self.host)
         self.native_base_url = '{0}/api/v1'.format(self.base_url)
         self.sword_base_url = '{0}/dvn/api/data-deposit/v1.1/swordv2'.format(self.base_url)
         self.sd_uri = '{0}/service-document'.format(self.sword_base_url)
diff --git a/dataverse/file.py b/dataverse/file.py
@@ -19,6 +19,10 @@ def __init__(self, dataset, name, file_id=None):
 
     @classmethod
     def from_json(cls, dataset, json):
-        name = json['datafile']['name']
-        file_id = json['datafile']['id']
+        try:
+            name = json['dataFile']['filename']
+            file_id = json['dataFile']['id']
+        except KeyError:
+            name = json['datafile']['name']
+            file_id = json['datafile']['id']
         return cls(dataset, name, file_id)
diff --git a/dataverse/settings/defaults.py b/dataverse/settings/defaults.py
@@ -2,7 +2,7 @@
 
 import os
 
-TEST_HOST = 'apitest.dataverse.org'
+TEST_HOST = 'demo.dataverse.org'
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 BASE_PATH = os.path.abspath(os.path.join(HERE, os.pardir))
diff --git a/readme.md b/readme.md
@@ -6,7 +6,7 @@ APIs v4.0.  The intent is to publish the python client on https://pypi.python.or
 ## Installation
 
     $ pip install -e git+https://github.com/IQSS/dataverse-client-python.git#egg=dataverse
-    
+
 Requires Python >= 2.6.
 
 
@@ -16,10 +16,12 @@ To use the python client, you will need a dataverse account and an API token.
 ```python
 from dataverse import Connection
 
-host = 'apitest.dataverse.org'                  # All clients >4.0 are supported
+host = 'demo.dataverse.org'                  # All clients >4.0 are supported
 token = '4d0634d3-74d5-4770-8088-1971847ac75e'  # Generated at /account/apitoken
 
 connection = Connection(host, token)
+# For non-https connections (e.g. local dev environment), try:
+#   connection = Connection(host, token, use_https=False)
 ```
 
 Dataverse Objects can be retrieved from their respective containers
@@ -37,7 +39,7 @@ Create a file at `dataverse/settings/local.py`. The file should contain the foll
 information:
 
 ```python
-TEST_HOST = 'apitest.dataverse.org'  # or 'dataverse-demo.iq.harvard.edu'
+TEST_HOST = 'demo.dataverse.org'
 ```
 
 Do not commit this file.
@@ -51,7 +53,7 @@ To run tests:
 Or, to run a specific test:
 
     $ py.test dataverse/test/test_dataverse.py::TestClassName::test_method_name
-    
+
 To check for style:
 
     $ flake8 .
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def read(fname):
 
 setup(
     name='dataverse',
-    version='0.1.1',
+    version='0.1.2',
     description='Python client for Dataverse version 3.X',
     long_description=read("readme.md"),
     author='Dataverse',

-Original file line number
+Diff line change
@@ @@ -1,7 +1,6 @@ @@
 language: python
 python:
 -  - 2.6
   - 2.7
   - 3.3
   #- 3.4 # "No output has been received in the last 10 minutes, this potentially indicates a stalled build or something wrong with the build itself."