From 0e858bba61a01dbab2794bf46f76106eebabfc5f Mon Sep 17 00:00:00 2001
From: Marek Marecki <triviuss@gmail.com>
Date: Mon, 18 Mar 2013 22:26:32 +0100
Subject: [PATCH] Fixed string manipulation in diaspy/models.py

---
 diaspy/models.py | 61 ++++++++++++++----------------------------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/diaspy/models.py b/diaspy/models.py
index 344b443..f3aaf13 100644
--- a/diaspy/models.py
+++ b/diaspy/models.py
@@ -9,7 +9,6 @@ class Post:
         Remember that you also need to be logged in.
 
     """
-
     def __init__(self, post_id, client):
         """
         :param post_id: id or guid of the post
@@ -26,14 +25,13 @@ class Post:
         self.post_id = post_id
 
     def get_data(self):
-        r = self._client.session.get(self._client.pod +
-                                     '/posts/' +
-                                     self.post_id +
-                                     '.json')
-        if r.status_code == 200:
+        """This function retrieves data of the post.
+        """
+        r = self._client.session.get('{0}/posts/{1}.json'.format(self._client.pod, self.post_id))
+        if r.status_code == 200: 
             return r.json()
-        else:
-            raise Exception('wrong status code: ' + str(r.status_code))
+        else: 
+            raise Exception('wrong status code: {0}'.format(r.status_code))
 
     def like(self):
         """This function likes a post. 
@@ -42,18 +40,14 @@ class Post:
         :returns: dict -- json formatted like object.
 
         """
-
         data = {'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.post(self._client.pod +
-                                      '/posts/' +
-                                      self.post_id +
-                                      '/likes',
+        r = self._client.session.post('{0}/posts/{1}/likes'.format(self._client.pod, self.post_id),
                                       data=data,
                                       headers={'accept': 'application/json'})
 
         if r.status_code != 201:
-            raise Exception(str(r.status_code) + ': Post could not be liked.')
+            raise Exception('{0}: Post could not be liked.'.format(r.status_code))
 
         return r.json()
 
@@ -61,40 +55,31 @@ class Post:
         """This function removes a like from a post
 
         """
-
         data = {'authenticity_token': self._client.get_token()}
 
         post_data = self.get_data()
 
-        r = self._client.session.delete(self._client.pod + '/posts/' +
-                                        self.post_id +
-                                        '/likes/' +
-                                        str(post_data['interactions']
-                                            ['likes'][0]['id']),
+        r = self._client.session.delete('{0}/posts/{1}/likes/{2}'.format(self._client.pod, self.post_id, post_data['interactions']['likes'][0]['id']),
                                         data=data)
 
         if r.status_code != 204:
-            raise Exception(str(r.status_code) +
-                            ': Like could not be removed.')
+            raise Exception('{0}: Like could not be removed.'.format(r.status_code))
 
     def reshare(self):
         """This function reshares a post
 
         """
-
         post_data = self.get_data()
 
         data = {'root_guid': post_data['guid'],
                 'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.post(self._client.pod +
-                                      '/reshares',
+        r = self._client.session.post('{0}/reshares'.format(self._client.pod),
                                       data=data,
                                       headers={'accept': 'application/json'})
 
         if r.status_code != 201:
-            raise Exception(str(r.status_code) +
-                            ': Post could not be reshared.')
+            raise Exception('{0}: Post could not be reshared.'.format(r.status_code))
 
         return r.json()
 
@@ -105,20 +90,15 @@ class Post:
         :type text: str
 
         """
-
         data = {'text': text,
                 'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.post(self._client.pod +
-                                      '/posts/' +
-                                      self.post_id +
-                                      '/comments',
+        r = self._client.session.post('{0}/posts/{1}/comments'.format(self._client.pod, self.post_id),
                                       data=data,
                                       headers={'accept': 'application/json'})
 
         if r.status_code != 201:
-            raise Exception(str(r.status_code) +
-                            ': Comment could not be posted.')
+            raise Exception('{0}: Comment could not be posted.'.format(r.status_code))
 
         return r.json()
 
@@ -129,28 +109,21 @@ class Post:
         :type comment_id: str
 
         """
-
         data = {'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.delete(self._client.pod + '/posts/' +
-                                        self.post_id +
-                                        '/comments/' +
-                                        comment_id,
+        r = self._client.session.delete('{0}/posts/{1}/comments/{2}'.format(self._client.pod, self.post_id, comment_id),
                                         data=data,
                                         headers={'accept': 'application/json'})
 
         if r.status_code != 204:
-            raise Exception(str(r.status_code) +
-                            ': Comment could not be deleted.')
+            raise Exception('{0}: Comment could not be deleted.'.format(r.status_code))
 
     def delete(self):
         """ This function deletes this post
 
         """
-
         data = {'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.delete(self._client.pod + '/posts/' +
-                                        self.post_id,
+        r = self._client.session.delete('{0}/posts/{1}'.format(self._client.pod, self.post_id),
                                         data=data,
                                         headers={'accept': 'application/json'})
-- 
2.25.1