CHanges in `Connection()` (medium-sized) and `Stream()` (extra small)

diff --git a/diaspy/connection.py b/diaspy/connection.py
index 772e95abc7764d7f07ca5e7077514f6ce4e3c563..a93c920374bc588441e50114b8cc1b034a4988e7 100644 (file)
--- a/diaspy/connection.py
+++ b/diaspy/connection.py
@@ -57,14 +57,7 @@ class Connection():
         :type params: dict
         """
         string = '{0}/{1}'.format(self.pod, string)
-        if headers and params:
-            request = self.session.post(string, data=data, headers=headers, params=params)
-        elif headers and not params:
-            request = self.session.post(string, data=data, headers=headers)
-        elif not headers and params:
-            request = self.session.post(string, data=data, params=params)
-        else:
-            request = self.session.post(string, data=data)
+        request = self.session.post(string, data, headers=headers, params=params)
         return request
 
     def delete(self, string, data, headers={}):
@@ -78,10 +71,7 @@ class Connection():
         :type headers: dict
         """
         string = '{0}/{1}'.format(self.pod, string)
-        if headers:
-            request = self.session.delete(string, data=data, headers=headers)
-        else:
-            request = self.session.delete(string, data=data)
+        request = self.session.delete(string, data=data, headers=headers)
         return request
 
     def _setlogin(self, username, password):

diff --git a/diaspy/streams.py b/diaspy/streams.py
index 195882b8068a1fd7bd8a2e1f950a129f49b3f7da..d01a0c0a4690bc6ca2505795a5b705f4afaf889e 100644 (file)
--- a/diaspy/streams.py
+++ b/diaspy/streams.py
@@ -57,16 +57,15 @@ class Generic:
         passing the desired one to the constructor.
         For example:
 
-            def _setlocation(self):
-                self._location = 'foo.json'
-
+        def _setlocation(self):
+            self._location = 'foo.json'
 
         :param location: url of the stream
         :type location: str
-
         :returns: str
         """
         self._location = 'stream.json'
+        return self._location
 
     def _obtain(self):
         """Obtains stream from pod.