Merge pull request #29 from Capitains/issue-28

Proposal fix for issue #28

.gitignore

@@ -1,5 +1,6 @@
 # Compiled python modules.
 *.pyc
+.idea
 
 # Setuptools distribution folder.
 /dist/

MyCapytain/common/reference.py

@@ -95,7 +95,7 @@ def __getitem__(self, key):
             >>>    a = Reference(reference="1.1@Achiles[1]-1.2@Zeus[1]")
             >>>    print(a[1]) # "1.1@Achiles[1]"
             >>>    print(a["start_list"]) # ("1", "1")
-            >>>    print(a[6"]) # ("Zeus", "1")
+            >>>    print(a[6]) # ("Zeus", "1")
             >>>    print(a[7]) # "1.1@Achiles[1]-1.2@Zeus[1]"
         """
         if key == 1 or key == "start":

MyCapytain/endpoints/cts5.py

@@ -33,7 +33,7 @@ def call(self, parameters):
         request = requests.get(self.endpoint, params=parameters)
         return request.text
 
-    def getCapabilities(self, inventory):
+    def getCapabilities(self, inventory=None):
         """ Retrieve the inventory information of an API 
         
         :param inventory: Name of the inventory
@@ -45,7 +45,7 @@ def getCapabilities(self, inventory):
             "request": "GetCapabilities"
         })
 
-    def getValidReff(self, urn, inventory, level=None):
+    def getValidReff(self, urn, inventory=None, level=None):
         """ Retrieve valid urn-references for a text
         
         :param urn: URN identifying the text
@@ -63,7 +63,7 @@ def getValidReff(self, urn, inventory, level=None):
             "request": "GetValidReff"
         })
 
-    def getFirstUrn(self, urn, inventory):
+    def getFirstUrn(self, urn, inventory=None):
         """ Retrieve the first passage urn of a text
         
         :param urn: URN identifying the text
@@ -78,7 +78,7 @@ def getFirstUrn(self, urn, inventory):
             "request": "GetFirstUrn"
         })
 
-    def getPrevNextUrn(self, urn, inventory):
+    def getPrevNextUrn(self, urn, inventory=None):
         """ Retrieve the previous and next passage urn of one passage
         
         :param urn: URN identifying the text's passage (Minimum depth : 1)
@@ -93,7 +93,7 @@ def getPrevNextUrn(self, urn, inventory):
             "request": "GetPrevNextUrn"
         })
 
-    def getLabel(self, urn, inventory):
+    def getLabel(self, urn, inventory=None):
         """ Retrieve informations about a CTS Urn
         
         :param urn: URN identifying the text's passage (Minimum depth : 1)
@@ -108,7 +108,7 @@ def getLabel(self, urn, inventory):
             "request": "GetLabel"
         })
 
-    def getPassage(self, urn, inventory, context=None):
+    def getPassage(self, urn, inventory=None, context=None):
         """ Retrieve a passage
         
         :param urn: URN identifying the text's passage (Minimum depth : 1)
@@ -126,7 +126,7 @@ def getPassage(self, urn, inventory, context=None):
             "request": "GetPassage"
         })
 
-    def getPassagePlus(self, urn, inventory, context=None):
+    def getPassagePlus(self, urn, inventory=None, context=None):
         """ Retrieve a passage and informations about it
         
         :param urn: URN identifying the text's passage (Minimum depth : 1)

MyCapytain/resources/inventory.py

@@ -33,7 +33,7 @@ def __str__(self):
 
         child = ""
         if isinstance(self.child, Citation):
-            child=str(self.child)
+            child = str(self.child)
 
         label = ""
         if self.name is not None:

MyCapytain/resources/proto/text.py

@@ -171,7 +171,7 @@ def getLabel(self):
 
     @property
     def reffs(self):
-        """ Get the lowest cRefPattern in the hierarchy
+        """ Get all valid reffs for every part of the Text
 
         :rtype: MyCapytain.resources.texts.tei.Citation
         """

tests/resources/texts/test_local.py

@@ -9,6 +9,7 @@
 import MyCapytain.resources.texts.local
 import MyCapytain.resources.texts.tei
 import MyCapytain.common.reference
+
 
 class TestLocalXMLTextImplementation(unittest.TestCase, xmlunittest.XmlTestMixin):