Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed formatting in license + readme

  • Loading branch information...
commit 570d81cc9a2c8529d37fc4a6279580d6f0056199 1 parent afaebad
@dustinwhittle dustinwhittle authored
Showing with 86 additions and 57 deletions.
  1. +28 −18 LICENSE
  2. +58 −39 README.markdown
View
46 LICENSE
@@ -1,23 +1,33 @@
-Copyrights for code authored by Yahoo! Inc. is licensed under the following terms:
+Yahoo! Social SDK
+Software License Agreement (BSD License)
+Copyright (c) 2009, Yahoo! Inc.
+All rights reserved.
-MIT License
+Redistribution and use of this software in source and binary forms, with
+or without modification, are permitted provided that the following
+conditions are met:
-Copyright (c) 2006-2009 Yahoo! Inc. All Rights Reserved.
+* Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+* Neither the name of Yahoo! Inc. nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of Yahoo! Inc.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
97 README.markdown
@@ -1,5 +1,5 @@
-Yahoo! Python SDK
-=================
+Yahoo! Social SDK - Python
+==========================
Find documentation and support on Yahoo! Developer Network: http://developer.yahoo.com
@@ -13,34 +13,51 @@ License
=======
@copyright: Copyrights for code authored by Yahoo! Inc. is licensed under the following terms:
-@license: MIT Open Source License
+@license: BSD Open Source License
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Yahoo! Social SDK
+Software License Agreement (BSD License)
+Copyright (c) 2009, Yahoo! Inc.
+All rights reserved.
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Redistribution and use of this software in source and binary forms, with
+or without modification, are permitted provided that the following
+conditions are met:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+* Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
-The Yahoo! Social Python SDK code is subject to the MIT license, see the LICENSE file.
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+The Yahoo! Social Python SDK code is subject to the BSD license, see the LICENSE file.
Requirements
============
The following dependencies are bundled with the Yahoo! Python SDK, but are under
-terms of a separate license:
+terms of a separate license. See the bundled LICENSE files for more information:
* SimpleJSON - http://code.google.com/p/simplejson
* OAuth - http://code.google.com/p/oauth
@@ -50,17 +67,18 @@ terms of a separate license:
Install
=======
-Simply make sure that this app is on your PYTHON PATH. Once it is in your PYTHON PATH
-then to use it in your project. The sdk also requires the oauth and simplejson modules:
+To install the library simply make sure that this package is in your PYTHON PATH.
+The sdk also requires the oauth and simplejson modules:
easy_install oauth simplejson
- python setup.py install
+ python setup.py install
Examples
========
## Fetching YQL:
+
import yahoo.yql
response = yahoo.yql.YQLQuery().execute('select * from delicious.feeds.popular')
@@ -73,32 +91,33 @@ Examples
## Fetching Social Data:
+
import yahoo.application
- # Yahoo! OAuth Credentials - http://developer.yahoo.com/dashboard/
+ # Yahoo! OAuth Credentials - http://developer.yahoo.com/dashboard/
- CONSUMER_KEY = '##'
- CONSUMER_SECRET = '##'
- APPLICATION_ID = '##'
- CALLBACK_URL = '##'
+ CONSUMER_KEY = '##'
+ CONSUMER_SECRET = '##'
+ APPLICATION_ID = '##'
+ CALLBACK_URL = '##'
- oauthapp = yahoo.application.OAuthApplication(CONSUMER_KEY, CONSUMER_SECRET, APPLICATION_ID, CALLBACK_URL)
+ oauthapp = yahoo.application.OAuthApplication(CONSUMER_KEY, CONSUMER_SECRET, APPLICATION_ID, CALLBACK_URL)
- # Fetch request token
- request_token = oauthapp.get_request_token()
+ # Fetch request token
+ request_token = oauthapp.get_request_token()
- # Redirect user to authorization url
- redirect_url = oauthapp.get_authorization_url(request_token, CALLBACK_URL)
+ # Redirect user to authorization url
+ redirect_url = oauthapp.get_authorization_url(request_token, CALLBACK_URL)
- # Exchange request token for authorized access token
- access_token = oauthapp.get_access_token(request_token)
+ # Exchange request token for authorized access token
+ access_token = oauthapp.get_access_token(request_token)
- # update access token
- oauthapp.token = access_token
+ # update access token
+ oauthapp.token = access_token
- profile = oauthapp.getProfile()
+ profile = oauthapp.getProfile()
- print profile
+ print profile
Tests
Please sign in to comment.
Something went wrong with that request. Please try again.