From: Marek Marecki <triviuss@gmail.com>
Date: Sat, 6 Jul 2013 10:33:23 +0000 (+0200)
Subject: Merge branch 'master' into settings
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c6c10c6d71844b293b35c5e024d6a33e1803a02f;p=diaspy.git

Merge branch 'master' into settings

Conflicts:
	diaspy/__init__.py
---

c6c10c6d71844b293b35c5e024d6a33e1803a02f
diff --cc diaspy/__init__.py
index 1050ee8,0d3caa3..c12c783
--- a/diaspy/__init__.py
+++ b/diaspy/__init__.py
@@@ -4,4 -4,6 +4,7 @@@ import diaspy.streams as stream
  import diaspy.client as client
  import diaspy.people as people
  import diaspy.notifications as notifications
 +import diaspy.settings as settings
+ 
+ 
+ __version__ = '0.2.0'
diff --cc diaspy/settings.py
index a63a801,0000000..24dc92f
mode 100644,000000..100644
--- a/diaspy/settings.py
+++ b/diaspy/settings.py
@@@ -1,20 -1,0 +1,19 @@@
 +import json
 +import re
 +import urllib
 +
 +
 +"""This module provides access to user's settings on Diaspora*.
 +"""
 +
 +
 +class Settings():
 +    """This object is used to get access to user's settings on
 +    Diaspora* and provides interface for downloading user's stuff.
 +    """
 +    def __init__(self, connection):
 +        self._connection = connection
 +    
 +    def downloadxml(self):
 +        request = self._connection.get('user/export')
 +        return request.text
-