Permalink
Browse files

Ran reindent.py

  • Loading branch information...
simoncadman committed Feb 13, 2014
1 parent aaee4be commit 61ef53f85c88dab68937c1d82f977dd9ce9fd685
Showing with 1,212 additions and 1,213 deletions.
  1. +161 −161 auth.py
  2. +160 −160 backend.py
  3. +56 −56 cloudprintrequestor.py
  4. +38 −38 deleteaccount.py
  5. +24 −24 dynamicppd.py
  6. +9 −9 listcloudprinters.py
  7. +6 −6 listdrivefiles.py
  8. +7 −7 pre-commit.py
  9. +514 −514 printer.py
  10. +5 −6 reportissues.py
  11. +138 −138 setupcloudprint.py
  12. +18 −18 test_auth.py
  13. +6 −6 test_backend.py
  14. +5 −5 test_cloudprintrequestor.py
  15. +11 −11 test_mockrequestor.py
  16. +35 −35 test_printer.py
  17. +19 −19 upgrade.py
View
322 auth.py
@@ -1,4 +1,4 @@
-# CUPS Cloudprint - Print via Google Cloud Print
+# CUPS Cloudprint - Print via Google Cloud Print
# Copyright (C) 2011 Simon Cadman
#
# This program is free software: you can redistribute it and/or modify
@@ -11,175 +11,175 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import json, os, grp, sys, grp
from oauth2client import client
from oauth2client import multistore_file
-from cloudprintrequestor import cloudprintrequestor
+from cloudprintrequestor import cloudprintrequestor
class Auth:
-
- clientid = "843805314553.apps.googleusercontent.com"
- clientsecret = 'MzTBsY4xlrD_lxkmwFbBrvBv'
- config = '/etc/cloudprint.conf'
-
- def GetLPID():
- # try lp first, then cups#
- lpgrp = None
- try:
- lpgrp = grp.getgrnam('lp')
- except:
+
+ clientid = "843805314553.apps.googleusercontent.com"
+ clientsecret = 'MzTBsY4xlrD_lxkmwFbBrvBv'
+ config = '/etc/cloudprint.conf'
+
+ def GetLPID():
+ # try lp first, then cups#
+ lpgrp = None
try:
- lpgrp = grp.getgrnam('cups')
+ lpgrp = grp.getgrnam('lp')
except:
- pass
- if lpgrp == None:
- return None
- else:
- return lpgrp.gr_gid
-
- GetLPID = staticmethod(GetLPID)
-
- def DeleteAccount(userid=None): # pragma: no cover
- """Delete an account from the configuration file
-
- Args:
- storage: storage, instance of storage to store credentials in.
- userid: string, reference for the account
-
- Returns:
- deleted: boolean , true on success
- """
- storage = multistore_file.get_credential_storage(
- Auth.config,
- Auth.clientid,
- userid,
- ['https://www.googleapis.com/auth/cloudprint'])
- return storage.delete()
-
- DeleteAccount = staticmethod(DeleteAccount)
-
- def AddAccount(storage, userid=None): # pragma: no cover
- """Adds an account to the configuration file
-
- Args:
- storage: storage, instance of storage to store credentials in.
- userid: string, reference for the account
-
- Returns:
- credentials: A credentials instance with the account details
- """
- if userid == None:
- userid = raw_input("Name for this user account ( eg something@gmail.com )? ")
-
- while True:
- flow = client.OAuth2WebServerFlow(client_id=Auth.clientid,
- client_secret=Auth.clientsecret,
- scope=['https://www.googleapis.com/auth/cloudprint'],
- user_agent=userid)
- auth_uri = flow.step1_get_authorize_url()
- print "Open this URL, grant access to CUPS Cloud Print, then provide the code displayed : \n\n" + auth_uri + "\n"
- code = raw_input('Code from Google: ')
- try:
- print ""
- credentials = flow.step2_exchange(code)
- storage.put(credentials)
+ try:
+ lpgrp = grp.getgrnam('cups')
+ except:
+ pass
+ if lpgrp == None:
+ return None
+ else:
+ return lpgrp.gr_gid
- # fix permissions
- Auth.FixConfigPermissions()
-
- return credentials
- except Exception as e:
- print "\nThe code does not seem to be valid ( " + str(e) + " ), please try again.\n"
-
- AddAccount = staticmethod(AddAccount)
-
- def FixConfigPermissions():
- filePermissions = True
- fileOwnerships = True
-
- try:
- os.chmod(Auth.config, 0660)
- except:
- filePermissions = False
- sys.stderr.write("DEBUG: Cannot alter config file permissions\n")
- pass
-
- try:
- os.chown(Auth.config, -1, Auth.GetLPID())
- except:
- fileOwnerships = False
- sys.stderr.write("DEBUG: Cannot alter config file ownership\n")
- pass
-
- return filePermissions, fileOwnerships
-
- FixConfigPermissions = staticmethod(FixConfigPermissions)
-
- def SetupAuth(interactive=False, permissions=['https://www.googleapis.com/auth/cloudprint']):
- """Sets up requestors with authentication tokens
-
- Args:
- interactive: boolean, when set to true can prompt user, otherwise returns False if authentication fails
-
- Returns:
- requestor, storage: Authenticated requestors and an instance of storage
- """
- modifiedconfig = False
-
- # parse config file and extract useragents, which we use for account names
- userids = []
- if os.path.exists( Auth.config ):
- content_file = open(Auth.config, 'r')
- content = content_file.read()
- data = json.loads(content)
- for user in data['data']:
- userids.append(str(user['credential']['user_agent']))
- else:
- modifiedconfig = True
-
- if len(userids) == 0:
- userids = [ None ]
-
- requestors = []
- for userid in userids:
- storage = multistore_file.get_credential_storage(
- Auth.config,
- Auth.clientid,
- userid,
- permissions)
- credentials = storage.get()
-
- if not credentials and interactive: # pragma: no cover
- credentials = Auth.AddAccount(storage, userid)
- modifiedconfig = True
+ GetLPID = staticmethod(GetLPID)
+
+ def DeleteAccount(userid=None): # pragma: no cover
+ """Delete an account from the configuration file
+
+ Args:
+ storage: storage, instance of storage to store credentials in.
+ userid: string, reference for the account
+
+ Returns:
+ deleted: boolean , true on success
+ """
+ storage = multistore_file.get_credential_storage(
+ Auth.config,
+ Auth.clientid,
+ userid,
+ ['https://www.googleapis.com/auth/cloudprint'])
+ return storage.delete()
+
+ DeleteAccount = staticmethod(DeleteAccount)
+
+ def AddAccount(storage, userid=None): # pragma: no cover
+ """Adds an account to the configuration file
+
+ Args:
+ storage: storage, instance of storage to store credentials in.
+ userid: string, reference for the account
+
+ Returns:
+ credentials: A credentials instance with the account details
+ """
if userid == None:
- userid = credentials.user_agent
-
- if credentials:
- # renew if expired
- requestor = cloudprintrequestor()
- if credentials.access_token_expired: # pragma: no cover
- from oauth2client.client import AccessTokenRefreshError
+ userid = raw_input("Name for this user account ( eg something@gmail.com )? ")
+
+ while True:
+ flow = client.OAuth2WebServerFlow(client_id=Auth.clientid,
+ client_secret=Auth.clientsecret,
+ scope=['https://www.googleapis.com/auth/cloudprint'],
+ user_agent=userid)
+ auth_uri = flow.step1_get_authorize_url()
+ print "Open this URL, grant access to CUPS Cloud Print, then provide the code displayed : \n\n" + auth_uri + "\n"
+ code = raw_input('Code from Google: ')
try:
- credentials.refresh(requestor)
- except AccessTokenRefreshError as e:
- sys.stderr.write("Failed to renew token (error: "+ str(e) +"), if you have revoked access to CUPS Cloud Print in your Google Account, please delete /etc/cloudprint.conf and re-run /usr/share/cloudprint-cups/setupcloudprint.py\n")
- sys.exit(1)
-
- requestor = credentials.authorize(requestor)
- requestor.setAccount(userid)
- requestors.append(requestor)
-
- # fix permissions
- if modifiedconfig:
- Auth.FixConfigPermissions()
-
- if not credentials:
- return False, False
- else:
- return requestors, storage
-
- SetupAuth = staticmethod(SetupAuth)
+ print ""
+ credentials = flow.step2_exchange(code)
+ storage.put(credentials)
+
+ # fix permissions
+ Auth.FixConfigPermissions()
+
+ return credentials
+ except Exception as e:
+ print "\nThe code does not seem to be valid ( " + str(e) + " ), please try again.\n"
+
+ AddAccount = staticmethod(AddAccount)
+
+ def FixConfigPermissions():
+ filePermissions = True
+ fileOwnerships = True
+
+ try:
+ os.chmod(Auth.config, 0660)
+ except:
+ filePermissions = False
+ sys.stderr.write("DEBUG: Cannot alter config file permissions\n")
+ pass
+
+ try:
+ os.chown(Auth.config, -1, Auth.GetLPID())
+ except:
+ fileOwnerships = False
+ sys.stderr.write("DEBUG: Cannot alter config file ownership\n")
+ pass
+
+ return filePermissions, fileOwnerships
+
+ FixConfigPermissions = staticmethod(FixConfigPermissions)
+
+ def SetupAuth(interactive=False, permissions=['https://www.googleapis.com/auth/cloudprint']):
+ """Sets up requestors with authentication tokens
+
+ Args:
+ interactive: boolean, when set to true can prompt user, otherwise returns False if authentication fails
+
+ Returns:
+ requestor, storage: Authenticated requestors and an instance of storage
+ """
+ modifiedconfig = False
+
+ # parse config file and extract useragents, which we use for account names
+ userids = []
+ if os.path.exists( Auth.config ):
+ content_file = open(Auth.config, 'r')
+ content = content_file.read()
+ data = json.loads(content)
+ for user in data['data']:
+ userids.append(str(user['credential']['user_agent']))
+ else:
+ modifiedconfig = True
+
+ if len(userids) == 0:
+ userids = [ None ]
+
+ requestors = []
+ for userid in userids:
+ storage = multistore_file.get_credential_storage(
+ Auth.config,
+ Auth.clientid,
+ userid,
+ permissions)
+ credentials = storage.get()
+
+ if not credentials and interactive: # pragma: no cover
+ credentials = Auth.AddAccount(storage, userid)
+ modifiedconfig = True
+ if userid == None:
+ userid = credentials.user_agent
+
+ if credentials:
+ # renew if expired
+ requestor = cloudprintrequestor()
+ if credentials.access_token_expired: # pragma: no cover
+ from oauth2client.client import AccessTokenRefreshError
+ try:
+ credentials.refresh(requestor)
+ except AccessTokenRefreshError as e:
+ sys.stderr.write("Failed to renew token (error: "+ str(e) +"), if you have revoked access to CUPS Cloud Print in your Google Account, please delete /etc/cloudprint.conf and re-run /usr/share/cloudprint-cups/setupcloudprint.py\n")
+ sys.exit(1)
+
+ requestor = credentials.authorize(requestor)
+ requestor.setAccount(userid)
+ requestors.append(requestor)
+
+ # fix permissions
+ if modifiedconfig:
+ Auth.FixConfigPermissions()
+
+ if not credentials:
+ return False, False
+ else:
+ return requestors, storage
+
+ SetupAuth = staticmethod(SetupAuth)
Oops, something went wrong.

0 comments on commit 61ef53f

Please sign in to comment.