From 4258d6bc4c8c608370ae39c34bec28d5a627e0db Mon Sep 17 00:00:00 2001 From: Joe Gregorio Date: Fri, 18 Mar 2011 10:20:16 -0400 Subject: [PATCH] made the installation easy_install friendly --- docs/apiclient.anyjson.html | 2 +- docs/apiclient.contrib.html | 5 +++-- docs/apiclient.discovery.html | 2 +- docs/apiclient.errors.html | 8 ++++---- docs/apiclient.ext.authtools.html | 9 ++++----- docs/apiclient.ext.file.html | 2 +- docs/apiclient.ext.html | 2 +- docs/apiclient.html | 13 ++++++------- docs/apiclient.http.html | 2 +- docs/apiclient.model.html | 2 +- docs/apiclient.oauth.html | 17 ++++++++++------- docs/dyn/buzz.v1.activities.html | 2 +- docs/dyn/shopping.v1.products.html | 16 ++++++++++++---- docs/httplib2.html | 12 +++++++++--- docs/httplib2.socks.html | 26 +++++++++++++------------- docs/oauth2client.client.html | 12 ++++++------ docs/oauth2client.file.html | 2 +- docs/oauth2client.html | 2 +- docs/oauth2client.tools.html | 19 ++++++++++++++----- docs/uritemplate.html | 2 +- setup.py | 7 ++++--- 21 files changed, 95 insertions(+), 69 deletions(-) diff --git a/docs/apiclient.anyjson.html b/docs/apiclient.anyjson.html index df64fcd..7471a08 100644 --- a/docs/apiclient.anyjson.html +++ b/docs/apiclient.anyjson.html @@ -8,7 +8,7 @@  
 
apiclient.anyjsonindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/anyjson.py +>index
/home/jcgregorio/projects/apiary/apiclient/anyjson.py

Utility module to import a JSON module
 
Hides all the messy details of exactly where
diff --git a/docs/apiclient.contrib.html b/docs/apiclient.contrib.html index 488fdaa..5950718 100644 --- a/docs/apiclient.contrib.html +++ b/docs/apiclient.contrib.html @@ -8,7 +8,7 @@  
 
apiclient.contribindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/contrib/__init__.py +>index
/home/jcgregorio/projects/apiary/apiclient/contrib/__init__.py

@@ -17,5 +17,6 @@ Package Contents -
       
+
buzz (package)
+
\ No newline at end of file diff --git a/docs/apiclient.discovery.html b/docs/apiclient.discovery.html index 1c52f52..0f0a75e 100644 --- a/docs/apiclient.discovery.html +++ b/docs/apiclient.discovery.html @@ -8,7 +8,7 @@  
 
apiclient.discoveryindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/discovery.py +>index
/home/jcgregorio/projects/apiary/apiclient/discovery.py

Client for discovery based APIs
 
A client library for Google's discovery based APIs.

diff --git a/docs/apiclient.errors.html b/docs/apiclient.errors.html index f99372f..d19fb96 100644 --- a/docs/apiclient.errors.html +++ b/docs/apiclient.errors.html @@ -8,7 +8,7 @@  
 
apiclient.errorsindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/errors.py +>index
/home/jcgregorio/projects/apiary/apiclient/errors.py

Errors for the library.
 
All exceptions defined by the library
@@ -65,7 +65,7 @@ Data descriptors defined here:

Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -187,7 +187,7 @@ Data descriptors inherited from Error:
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -248,7 +248,7 @@ Data descriptors inherited from Error:
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
diff --git a/docs/apiclient.ext.authtools.html b/docs/apiclient.ext.authtools.html index df797cf..63c30ea 100644 --- a/docs/apiclient.ext.authtools.html +++ b/docs/apiclient.ext.authtools.html @@ -8,7 +8,7 @@  
 
apiclient.ext.authtoolsindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/ext/authtools.py +>index
/home/jcgregorio/projects/apiary/apiclient/ext/authtools.py

Command-line tools for authenticating via OAuth 1.0
 
Do the OAuth 1.0 Three Legged Dance for
@@ -23,11 +23,10 @@ other example apps in the same directory.

       
BaseHTTPServer
-logging
-		pickle
-socket
+		logging
+		socket
sys
-

+

 
diff --git a/docs/apiclient.ext.file.html b/docs/apiclient.ext.file.html index 49df8e2..f11778f 100644 --- a/docs/apiclient.ext.file.html +++ b/docs/apiclient.ext.file.html @@ -8,7 +8,7 @@ 		 
 
apiclient.ext.file		index
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/ext/file.py
+>index
/home/jcgregorio/projects/apiary/apiclient/ext/file.py

Utilities for OAuth.
 
Utilities for making it easier to work with OAuth 1.0 credentials.

diff --git a/docs/apiclient.ext.html b/docs/apiclient.ext.html index f121463..d3b597d 100644 --- a/docs/apiclient.ext.html +++ b/docs/apiclient.ext.html @@ -8,7 +8,7 @@  
 
apiclient.extindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/ext/__init__.py +>index
/home/jcgregorio/projects/apiary/apiclient/ext/__init__.py

diff --git a/docs/apiclient.html b/docs/apiclient.html index bf91ae5..4e9ce70 100644 --- a/docs/apiclient.html +++ b/docs/apiclient.html @@ -8,7 +8,7 @@
 
 
apiclient		index
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/__init__.py
+>index
/home/jcgregorio/projects/apiary/apiclient/__init__.py

@@ -19,12 +19,11 @@
       
anyjson
contrib (package)
-discovery
-		errors
-ext (package)
+		discovery
+errors
+		ext (package)
http
-		json
-model
+		model
oauth
-
+ \ No newline at end of file diff --git a/docs/apiclient.http.html b/docs/apiclient.http.html index 5daef03..a9c5ce4 100644 --- a/docs/apiclient.http.html +++ b/docs/apiclient.http.html @@ -8,7 +8,7 @@  
 
apiclient.httpindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/http.py +>index
/home/jcgregorio/projects/apiary/apiclient/http.py

Classes to encapsulate a single HTTP request.
 
The classes implement a command pattern, with every
diff --git a/docs/apiclient.model.html b/docs/apiclient.model.html index e51c6f2..8d870d0 100644 --- a/docs/apiclient.model.html +++ b/docs/apiclient.model.html @@ -8,7 +8,7 @@  
 
apiclient.modelindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/model.py +>index
/home/jcgregorio/projects/apiary/apiclient/model.py

Model objects for requests and responses.
 
Each API may support one or more serializations, such
diff --git a/docs/apiclient.oauth.html b/docs/apiclient.oauth.html index f7150ba..602e8f5 100644 --- a/docs/apiclient.oauth.html +++ b/docs/apiclient.oauth.html @@ -8,7 +8,7 @@  
 
apiclient.oauthindex
/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/oauth.py +>index
/home/jcgregorio/projects/apiary/apiclient/oauth.py

Utilities for OAuth.
 
Utilities for making it easier to work with OAuth.

@@ -114,7 +114,7 @@ Data descriptors inherited from Error:<
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -174,7 +174,7 @@ Data descriptors defined here:
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -266,9 +266,12 @@ at the callback uri to step2_exchange.
step2_exchange(self, verifier)
Exhanges an authorized request token
for OAuthCredentials.
 
-verifier - either the verifier token, or a dictionary
+Args:
+  verifier: string, dict - either the verifier token, or a dictionary
    of the query parameters to the callback, which contains
-    the oauth_verifier.
+    the oauth_verifier.
+Returns:
+   The Credentials object.
Data descriptors inherited from Flow:
@@ -299,7 +302,7 @@ Data descriptors inherited from Error:<
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -426,7 +429,7 @@ Data descriptors inherited from Error:<
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
diff --git a/docs/dyn/buzz.v1.activities.html b/docs/dyn/buzz.v1.activities.html index cdfe90e..e88dd37 100644 --- a/docs/dyn/buzz.v1.activities.html +++ b/docs/dyn/buzz.v1.activities.html @@ -56,7 +56,7 @@ Args:
get = method(self, **kwargs)
Get an activity
 
Args:
-  postId: string, ID of the user to get. (required)
+  postId: string, ID of the post to get. (required)
  userId: string, ID of the user whose post to get. (required)
  truncateAtom: boolean, Truncate the value of the atom:content element.
  hl: string, Language code to limit language results.
diff --git a/docs/dyn/shopping.v1.products.html b/docs/dyn/shopping.v1.products.html index e97ca10..6ca32d7 100644 --- a/docs/dyn/shopping.v1.products.html +++ b/docs/dyn/shopping.v1.products.html @@ -38,8 +38,10 @@ Args:
 
Args:
  facets_enabled: boolean, Whether to return facet information
-  rankBy: string, Ranking specification
+  debug_geocodeRequest: boolean, Google Internal
+  stores: string, Local stores specification
  debug_searchResponse: boolean, Google Internal
+  debug_rdcRequest: boolean, Google Internal
  taxonomy: string, Taxonomy name
  promotions_enabled: boolean, Whether to return promotion information
  debug_rdcResponse: boolean, Google Internal
@@ -48,15 +50,19 @@ Args:
  redirects_useGcsConfig: boolean, Whether to return redirect information as configured in the GCS account
  crowdBy: string, Crowding specification
  spelling_enabled: boolean, Whether to return spelling suggestions
+  sayt_enabled: boolean, Google Internal
  debug_enabled: boolean, Google Internal
  spelling_useGcsConfig: boolean, This parameter is currently ignored
  source: string, Query source (required)
  useCase: string, One of CommerceSearchUseCase, ProductSearchUseCase
+  debug_geocodeResponse: boolean, Google Internal
+  categories_include: string, Category specification
  debug_searchRequest: boolean, Google Internal
+  relatedQueries_enabled: boolean, Whether to return related queries
  facets_useGcsConfig: boolean, Whether to return facet information as configured in the GCS account
-  debug_enableLogging: boolean, Google Internal
-  boostBy: string, Boosting specification
  safe: boolean, Whether safe search is enabled. Default: true
+  boostBy: string, Boosting specification
+  debug_enableLogging: boolean, Google Internal
  maxResults: integer, Maximum number of results to return
  categories_enabled: boolean, Whether to return category information
  categories_useGcsConfig: boolean, This parameter is currently ignored
@@ -65,10 +71,12 @@ Args:
  language: string, Language restriction (BCP 47)
  currency: string, Currency restriction (ISO 4217)
  country: string, Country restriction (ISO 3166)
-  categories_include: string, Category specification
+  rankBy: string, Ranking specification
  redirects_enabled: boolean, Whether to return redirect information
  restrictBy: string, Restriction specification
  q: string, Search query
+  sayt_useGcsConfig: boolean, Google Internal
+  relatedQueries_useGcsConfig: boolean, This parameter is currently ignored
  promotions_useGcsConfig: boolean, Whether to return promotion information as configured in the GCS account
diff --git a/docs/httplib2.html b/docs/httplib2.html index 017ec70..944ec63 100644 --- a/docs/httplib2.html +++ b/docs/httplib2.html @@ -8,7 +8,7 @@  
 
httplib2 (version $Rev$)index
/usr/local/google/home/jcgregorio/projects/apiclient/httplib2/__init__.py +>index
/home/jcgregorio/projects/apiary/httplib2/__init__.py

@@ -207,7 +207,7 @@ Data descriptors defined here:
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -266,7 +266,7 @@ Data descriptors inherited from HttpLib2Er
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -558,6 +558,12 @@ In either case, this is followed by: for 
values(...)
D.values() -> list of D's values
+
viewitems(...)
D.viewitems() -> a set-like object providing a view on D's items
+ +
viewkeys(...)
D.viewkeys() -> a set-like object providing a view on D's keys
+ +
viewvalues(...)
D.viewvalues() -> an object providing a view on D's values
+
Data and other attributes inherited from __builtin__.dict:
__hash__ = None
diff --git a/docs/httplib2.socks.html b/docs/httplib2.socks.html index 714b016..cfcd67e 100644 --- a/docs/httplib2.socks.html +++ b/docs/httplib2.socks.html @@ -8,7 +8,7 @@
 
 
httplib2.socks		index
/usr/local/google/home/jcgregorio/projects/apiclient/httplib2/socks.py
+>index
/home/jcgregorio/projects/apiary/httplib2/socks.py

SocksiPy - Python SOCKS module.
Version 1.00
 
@@ -500,17 +500,17 @@ Wait for an incoming connection.  Return a&nb connection, and the address of the client.  For IP sockets, the address
info is a pair (hostaddr, port). -

bind(self, *args)
bind(address)
+
bind(...)
bind(address)
 
Bind the socket to a local address.  For IP sockets, the address is a
pair (host, port); the host must refer to the local host. For raw packet
sockets the address is a tuple (ifname, proto [,pkttype [,hatype]])
-
close(self)
close()
+
close(self, _closedsocket=<class 'socket._closedsocket'>, _delegate_methods=('recv', 'recvfrom', 'recv_into', 'recvfrom_into', 'send', 'sendto'), setattr=<built-in function setattr>)
close()
 
Close the socket.  It cannot be used after this call.
-
connect_ex(self, *args)
connect_ex(address) -> errno
+
connect_ex(...)
connect_ex(address) -> errno
 
This is like connect(address), but returns an error code (the errno value)
instead of raising an exception when an error occurs.
@@ -519,28 +519,28 @@ instead of raising an exception when an error  
Return a new socket object connected to the same system resource.
-
fileno(self, *args)
fileno() -> integer
+
fileno(...)
fileno() -> integer
 
Return the integer file descriptor of the socket.
-
getsockname(self, *args)
getsockname() -> address info
+
getsockname(...)
getsockname() -> address info
 
Return the address of the local endpoint.  For IP sockets, the address
info is a pair (hostaddr, port).
-
getsockopt(self, *args)
getsockopt(level, option[, buffersize]) -> value
+
getsockopt(...)
getsockopt(level, option[, buffersize]) -> value
 
Get a socket option.  See the Unix manual for level and option.
If a nonzero buffersize argument is given, the return value is a
string of that length; otherwise it is an integer.
-
gettimeout(self, *args)
gettimeout() -> timeout
+
gettimeout(...)
gettimeout() -> timeout
 
Returns the timeout in floating seconds associated with socket 
operations. A timeout of None indicates that timeouts on socket 
operations are disabled.
-
listen(self, *args)
listen(backlog)
+
listen(...)
listen(backlog)
 
Enable a server to accept connections.  The backlog argument must be at
least 1; it specifies the number of unaccepted connection that the system
@@ -551,25 +551,25 @@ will allow before refusing new connections.
and bufsize arguments are as for the built-in open() function.
-
setblocking(self, *args)
setblocking(flag)
+
setblocking(...)
setblocking(flag)
 
Set the socket to blocking (flag is true) or non-blocking (false).
setblocking(True) is equivalent to settimeout(None);
setblocking(False) is equivalent to settimeout(0.0).
-
setsockopt(self, *args)
setsockopt(level, option, value)
+
setsockopt(...)
setsockopt(level, option, value)
 
Set a socket option.  See the Unix manual for level and option.
The value argument can either be an integer or a string.
-
settimeout(self, *args)
settimeout(timeout)
+
settimeout(...)
settimeout(timeout)
 
Set a timeout on socket operations.  'timeout' can be a float,
giving in seconds, or None.  Setting a timeout of None disables
the timeout feature and is equivalent to setblocking(1).
Setting a timeout of zero is the same as setblocking(0).
-
shutdown(self, *args)
shutdown(flag)
+
shutdown(...)
shutdown(flag)
 
Shut down the reading side of the socket (flag == SHUT_RD), the writing side
of the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).
diff --git a/docs/oauth2client.client.html b/docs/oauth2client.client.html index e773369..1693061 100644 --- a/docs/oauth2client.client.html +++ b/docs/oauth2client.client.html @@ -8,7 +8,7 @@  
 
oauth2client.clientindex
/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/client.py +>index
/home/jcgregorio/projects/apiary/oauth2client/client.py

An OAuth 2.0 client
 
Tools for interacting with OAuth 2.0 protected
@@ -194,7 +194,7 @@ Data descriptors inherited from Error

Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -255,7 +255,7 @@ Data descriptors inherited from Error
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -342,7 +342,7 @@ Data descriptors defined here:
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -419,7 +419,7 @@ Data descriptors inherited from Error
Methods inherited from exceptions.Exception:
-
__init__(...)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
+
__init__(...)
x.__init__(...) initializes x; see help(type(x)) for signature
Data and other attributes inherited from exceptions.Exception:
@@ -565,7 +565,7 @@ Data descriptors inherited from C
Methods defined here:
-
__init__(self, client_id, client_secret, scope, user_agent, auth_uri='https://www.google.com/accounts/o8/oauth2/authorization', token_uri='https://www.google.com/accounts/o8/oauth2/token', **kwargs)
Constructor for OAuth2WebServerFlow
+
__init__(self, client_id, client_secret, scope, user_agent, auth_uri='https://accounts.google.com/o/oauth2/auth', token_uri='https://accounts.google.com/o/oauth2/token', **kwargs)
Constructor for OAuth2WebServerFlow
 
Args:
  client_id: string, client identifier.
diff --git a/docs/oauth2client.file.html b/docs/oauth2client.file.html index 8c76cbf..444a77a 100644 --- a/docs/oauth2client.file.html +++ b/docs/oauth2client.file.html @@ -8,7 +8,7 @@  
 
oauth2client.fileindex
/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/file.py +>index
/home/jcgregorio/projects/apiary/oauth2client/file.py

Utilities for OAuth.
 
Utilities for making it easier to work with OAuth 2.0
diff --git a/docs/oauth2client.html b/docs/oauth2client.html index 9ca5fd4..a8f23e0 100644 --- a/docs/oauth2client.html +++ b/docs/oauth2client.html @@ -8,7 +8,7 @@  
 
oauth2clientindex
/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/__init__.py +>index
/home/jcgregorio/projects/apiary/oauth2client/__init__.py

diff --git a/docs/oauth2client.tools.html b/docs/oauth2client.tools.html index e87f586..d1c97ec 100644 --- a/docs/oauth2client.tools.html +++ b/docs/oauth2client.tools.html @@ -8,7 +8,7 @@
 
 
oauth2client.tools		index
/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/tools.py
+>index
/home/jcgregorio/projects/apiary/oauth2client/tools.py

Command-line tools for authenticating via OAuth 2.0
 
Do the OAuth 2.0 Web Server dance for a command line application. Stores the
@@ -16,6 +16,18 @@ generated credentials in a common file that i the same directory.

+ + + + +
 
+Modules
       
BaseHTTPServer
+gflags
+		logging
+socket
+		sys
+

+ @@ -28,10 +40,7 @@ Args:
  storage: Storage, a Storage to store the credential in.
 
Returns:
-  Credentials, the obtained credential.
- 
-Exceptions:
-  RequestError: if step2 of the flow fails. +  Credentials, the obtained credential.
 
Functions

diff --git a/docs/uritemplate.html b/docs/uritemplate.html index 4801a0a..38598ae 100644 --- a/docs/uritemplate.html +++ b/docs/uritemplate.html @@ -8,7 +8,7 @@
 
 
uritemplate		index
/usr/local/google/home/jcgregorio/projects/apiclient/uritemplate/__init__.py
+>index
/home/jcgregorio/projects/apiary/uritemplate/__init__.py

# Early, and incomplete implementation of -04.
#

diff --git a/setup.py b/setup.py index 6e8fbb9..8a3c867 100644 --- a/setup.py +++ b/setup.py @@ -28,10 +28,10 @@ packages = [ 'apiclient.contrib.buzz', 'apiclient.contrib.latitude', 'apiclient.contrib.moderator', - 'uritemplate' + 'uritemplate', ] -third_party_reqs = ['httplib2', 'oauth2'] +third_party_reqs = ['httplib2'] # Don't clobber installed versions of third party libraries # with what we include. @@ -47,7 +47,7 @@ long_desc = """The Google API Client for Python is a client library for accessing the Buzz, Moderator, and Latitude APIs.""" setup(name="google-api-python-client", - version="1.0alpha1", + version="1.0alpha2", description="Google API Client Library for Python", long_description=long_desc, author="Joe Gregorio", @@ -58,6 +58,7 @@ setup(name="google-api-python-client", 'apiclient': ['contrib/*/*.json'] }, license="Apache 2.0", + install_requires = ['python-gflags', 'oauth2'], keywords="google api client", classifiers=['Development Status :: 3 - Alpha', 'Intended Audience :: Developers',