Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
martey committed May 16, 2012
2 parents 15d284f + accad2d commit e342329
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions facebook.py
Expand Up @@ -124,10 +124,10 @@ def put_object(self, parent_object, connection_name, **data):
See http://developers.facebook.com/docs/api#publishing for all of
the supported writeable objects.
Most write operations require extended permissions. For example,
publishing wall posts requires the "publish_stream" permission. See
http://developers.facebook.com/docs/authentication/ for details about
extended permissions.
Certain write operations require extended permissions. For example,
publishing to a user's feed requires the "publish_actions" permission. See
http://developers.facebook.com/docs/publishing/ for details about
publishing permissions.
"""
assert self.access_token, "Write operations require an access token"
return self.request(parent_object + "/" + connection_name,
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Expand Up @@ -18,10 +18,10 @@ Photo uploads:

graph = facebook.GraphAPI(oauth_access_token)
tags = json.dumps([{'x':50, 'y':50, tag_uid:12345}, {'x':10, 'y':60, tag_text:'a turtle'}])
graph.put_photo('img.jpg', 'Look at this cool photo!', album_id_or_None, tags=tags)
graph.put_photo(open('img.jpg'), 'Look at this cool photo!', album_id_or_None, tags=tags)

If you are using the module within a web application with the
[JavaScript SDK](http://github.com/facebook/connect-js), you can also use the
[JavaScript SDK](https://github.com/facebook/facebook-js-sdk), you can also use the
module to use Facebook for login, parsing the cookie set by the JavaScript SDK
for logged in users. For example, in Google AppEngine, you could get the
profile of the logged in user with:
Expand Down

0 comments on commit e342329

Please sign in to comment.