switch to use nuxeo-client-library

basic switch out of `requests` for `nuxeo.request`

Author: tingletech

.travis.yml

@@ -6,8 +6,9 @@ python:
   - "2.7"
 install: 
   - python setup.py install
+  - pip install httpretty
 script:
-  - python setup.py test 
+  - python pynux/tests/test_utils.py
 
 #before_script:
 #  - git config --global user.name "Teracy" # Configure your git user.name here

pynux/tests/test_utils.py

@@ -12,7 +12,7 @@
 class TestNuxeoREST(unittest.TestCase):
     def setUp(self):
         self.nx = utils.Nuxeo({
-            'api': 'http://mockme/r',
+            'api': 'http://localhost:8080/nuxeo/',
         }, rcfile=io.BytesIO(bytes()))
 
     @httpretty.activate

pynux/utils.py

@@ -12,7 +12,6 @@
 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
-import requests
 import json
 import sys
 import os
@@ -23,6 +22,7 @@
 from os.path import expanduser
 import codecs
 import urllib.parse
+import nuxeo.client
 
 # set the output to utf8 in py2 or py3
 UTF8Writer = codecs.getwriter('utf8')
@@ -157,6 +157,8 @@ def __init__(self, conf={}, rcfile=None, loglevel=_loglevel_):
         redacted = self.conf
         redacted.update({'password': '...redacted...'})
         self.logger.debug(redacted)
+        self.nuxeo_client = nuxeo.client.Nuxeo(auth=self.auth)
+        self.request = self.nuxeo_client.client.request
 
     ## Python generator for paged API resource
     #    based on http://stackoverflow.com/questions/17702785/
@@ -173,12 +175,8 @@ def _get_page(self, url, params, current_page_index):
         :returns: json from nuxeo
         """
         params.update({'currentPageIndex': current_page_index})
-        res = requests.get(
-            url,
-            headers=self.document_property_headers,
-            params=params,
-            auth=self.auth)
-        res.raise_for_status()
+        path = url.split(self.nuxeo_client.client.host,1)[1]
+        res = self.request('GET', path, params=params)
         self.logger.debug(res.content)
         return json.loads(res.content.decode('utf-8'))
 
@@ -249,9 +247,8 @@ def get_uid(self, path):
         :rtype: string
         """
         url = u'/'.join([self.conf['api'], "path", escape_path(path).strip('/')])
-        res = requests.get(
-            url, headers=self.document_property_headers, auth=self.auth)
-        res.raise_for_status()
+        path = url.split(self.nuxeo_client.client.host,1)[1]
+        res = self.request('GET', path)
         return json.loads(res.content.decode('utf-8'))['uid']
 
     def get_metadata(self, **documentid):
@@ -268,9 +265,8 @@ def get_metadata(self, **documentid):
         elif 'uid' in documentid:
             uid = documentid['uid']
         url = u'/'.join([self.conf['api'], "id", uid])
-        res = requests.get(
-            url, headers=self.document_property_headers, auth=self.auth)
-        res.raise_for_status()
+        path = url.split(self.nuxeo_client.client.host,1)[1]
+        res = self.request('GET', path)
         return json.loads(res.content.decode('utf-8'))
 
     def update_nuxeo_properties(self, data, **documentid):
@@ -297,9 +293,8 @@ def update_nuxeo_properties(self, data, **documentid):
         payload['uid'] = uid
         payload['entity-type'] = data.get('entity-type', 'document')
         payload['properties'] = data['properties']
-        res = requests.put(
-            url, data=json.dumps(payload), auth=self.auth, headers=headers)
-        res.raise_for_status()
+        path = url.split(self.nuxeo_client.client.host,1)[1]
+        res = self.request('PUT', path, data=json.dumps(payload))
         return json.loads(res.content)
 
     def print_document_summary(self, documents):

setup.py

@@ -2,13 +2,13 @@
 from setuptools import setup, find_packages
 setup(
     name='pynux',
-    version = "1.0.4",
+    version = "1.1.0-alpha",
     packages = find_packages(),
     install_requires = [
-        'requests',
         'configparser',
         'future',
         'EZID @ https://github.com/ucldc/ezid/archive/v0.4.2.tar.gz',
+        'nuxeo',
     ],
     test_suite = 'pynux.tests.test_utils',
     tests_require = ['httpretty'],