Bumped version, pep8

Author: STITCHplus

kb/nl/api/oai.py

@@ -8,6 +8,7 @@
 
 
 class oai():
+
     """
         OAI interface to the National Library of the Netherlands.
         For more information on the OAI protocol, visit:
@@ -35,7 +36,7 @@ class oai():
     resumptiontoken = False
     DEBUG = False
 
-    def __init__(self, current_set = False):
+    def __init__(self, current_set=False):
         if current_set:
             self.current_set = current_set
 
@@ -130,6 +131,7 @@ def get(self, identifier):
 
 
 class records():
+
     """
         Class for parsing xml output from OAI server,
         to usable objects.
@@ -162,12 +164,14 @@ def deleted_identifiers(self):
         deleted = []
         for item in self.records_data[2]:
             if item.tag.endswith('record'):
-                if item[0].tag.endswith('header') and item[0].attrib.get('status') == 'deleted':
+                if item[0].tag.endswith('header') and \
+                   item[0].attrib.get('status') == 'deleted':
                     deleted.append(item[0][0].text)
         return deleted
 
 
 class record():
+
     """
         Class for parsing XML output from OAI server,
         to more human readable form. This class
@@ -265,7 +269,8 @@ def alto(self):
                     sys.stdout.write(alto_url + " ")
 
                 if not response.status_code == 200:
-                    raise Exception('Error while getting data from %s' % alto_url)
+                    raise Exception(
+                        'Error while getting data from %s' % alto_url)
 
                 alto_list.append(response.text)
 
@@ -282,18 +287,15 @@ def ocr(self):
             if item.attrib and \
                item.attrib.get('ref') and \
                item.attrib['ref'].lower().endswith(':ocr'):
+                url = item.attrib['ref']
+                if self.DEBUG:
+                    sys.stdout.write(url)
 
-		url = item.attrib['ref']
-
-		if self.DEBUG:
-			sys.stdout.write(url)
-
-		response = requests.get(url)
-		if not response.status_code == 200:
-			return False
-		return response.text
-	return False
-
+                response = requests.get(url)
+                if not response.status_code == 200:
+                    return False
+                return response.text
+        return False
 
     @property
     def image(self):

kb/nl/api/sru.py

@@ -2,6 +2,11 @@
 import requests
 import urllib
 
+try:
+    from urllib import quote  # Python 2.X
+except ImportError:
+    from urllib.parse import quote  # Python 3+
+
 from kb.nl.collections import SETS
 from kb.nl.helpers import etree
 
@@ -17,15 +22,6 @@ class response():
     def __init__(self, record_data, sru):
         self.record_data = record_data
         self.sru = sru
-    
-    """
-    @property
-    def identifiers(self):
-        id = [i.text.split('=')[1] for i in self.record_data.iter() if
-              i.tag.endswith('identifier') and
-              i.text.find(':') > -1]
-        return id
-   """
 
     @property
     def records(self):
@@ -37,23 +33,24 @@ def records(self):
                                                  namespaces=ns)[0]
         return(record(record_data, self.sru))
 
-    # TODO: distinguish by xsi:type 
+    # TODO: distinguish by xsi:type
     @property
     def identifiers(self):
-        result = [r.text.replace('http://resolver.kb.nl/resolve?urn=', '') for r in self.record_data.iter() if
+        baseurl = 'http://resolver.kb.nl/resolve?urn='
+        result = [r.text.replace(baseurl, '') for r in self.record_data.iter() if
                   r.tag.endswith('identifier') and r.text.find(':') > -1]
         return result
 
     @property
     def types(self):
         return [r.text for r in self.record_data.iter() if
                 r.tag.endswith('type')]
-    
+
     @property
     def languages(self):
         return [r.text for r in self.record_data.iter() if
                 r.tag.endswith('language')]
-   
+
     @property
     def dates(self):
         return [r.text for r in self.record_data.iter() if
@@ -137,7 +134,7 @@ def search(self, query, collection=False,
                startrecord=1, maximumrecords=1, recordschema=False):
 
         self.maximumrecords = maximumrecords
-        self.query = urllib.quote_plus(query)
+        self.query = quote(query)
         self.startrecord = startrecord
 
         if collection not in self.sru_collections:
@@ -160,7 +157,7 @@ def search(self, query, collection=False,
 
         self.nr_of_records = int(nr_of_records)
 
-        if nr_of_records > 0:
+        if self.nr_of_records > 0:
             return response(record_data, self)
 
         return False

kb/nl/collections/__init__.py

@@ -28,4 +28,4 @@
                 'metadataPrefix': 'dcx',
                 'recordschema': 'dcx',
                 'setname': 'ggc',
-                'time_period': [1937, 2016]}} # No idea what to use here?
+                'time_period': [1937, 2016]}}

setup.py

@@ -6,7 +6,7 @@
     name='kb',
     url="https://github.com/KBNLresearch/KB-python-API",
     description='Access to National Library of the Netherlands datasets',
-    version='0.1.6',
+    version='0.1.7',
     packages=['kb.nl.api', 'kb.nl.helpers', 'kb', 'kb.nl', 'kb.nl.collections'],
     license='GNU General Public License',
     install_requires=['lxml>=2.3', 'requests'],