Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . python-oauth2client (1.2-3) unstable; urgency=medium . * Fixes VCS URLs. * Added Python 3 support. Author: Thomas Goirand --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: https://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- python-oauth2client-1.2.orig/oauth2client/appengine.py +++ python-oauth2client-1.2/oauth2client/appengine.py @@ -187,7 +187,7 @@ class AppAssertionCredentials(AssertionC try: scopes = self.scope.split() (token, _) = app_identity.get_access_token(scopes) - except app_identity.Error, e: + except app_identity.Error as e: raise AccessTokenRefreshError(str(e)) self.access_token = token --- python-oauth2client-1.2.orig/oauth2client/file.py +++ python-oauth2client-1.2/oauth2client/file.py @@ -92,7 +92,7 @@ class Storage(BaseStorage): simple version of "touch" to ensure the file has been created. """ if not os.path.exists(self._filename): - old_umask = os.umask(0177) + old_umask = os.umask(0o177) try: open(self._filename, 'a+b').close() finally: --- python-oauth2client-1.2.orig/oauth2client/gce.py +++ python-oauth2client-1.2/oauth2client/gce.py @@ -83,7 +83,7 @@ class AppAssertionCredentials(AssertionC if response.status == 200: try: d = simplejson.loads(content) - except StandardError, e: + except StandardError as e: raise AccessTokenRefreshError(str(e)) self.access_token = d['accessToken'] else: --- python-oauth2client-1.2.orig/oauth2client/locked_file.py +++ python-oauth2client-1.2/oauth2client/locked_file.py @@ -122,7 +122,7 @@ class _PosixOpener(_Opener): validate_file(self._filename) try: self._fh = open(self._filename, self._mode) - except IOError, e: + except IOError as e: # If we can't access with _mode, try _fallback_mode and don't lock. if e.errno == errno.EACCES: self._fh = open(self._filename, self._fallback_mode) @@ -137,7 +137,7 @@ class _PosixOpener(_Opener): self._locked = True break - except OSError, e: + except OSError as e: if e.errno != errno.EEXIST: raise if (time.time() - start_time) >= timeout: @@ -192,7 +192,7 @@ try: validate_file(self._filename) try: self._fh = open(self._filename, self._mode) - except IOError, e: + except IOError as e: # If we can't access with _mode, try _fallback_mode and don't lock. if e.errno == errno.EACCES: self._fh = open(self._filename, self._fallback_mode) @@ -204,7 +204,7 @@ try: fcntl.lockf(self._fh.fileno(), fcntl.LOCK_EX) self._locked = True return - except IOError, e: + except IOError as e: # If not retrying, then just pass on the error. if timeout == 0: raise e @@ -267,7 +267,7 @@ try: validate_file(self._filename) try: self._fh = open(self._filename, self._mode) - except IOError, e: + except IOError as e: # If we can't access with _mode, try _fallback_mode and don't lock. if e.errno == errno.EACCES: self._fh = open(self._filename, self._fallback_mode) @@ -284,7 +284,7 @@ try: pywintypes.OVERLAPPED()) self._locked = True return - except pywintypes.error, e: + except pywintypes.error as e: if timeout == 0: raise e @@ -308,7 +308,7 @@ try: try: hfile = win32file._get_osfhandle(self._fh.fileno()) win32file.UnlockFileEx(hfile, 0, -0x10000, pywintypes.OVERLAPPED()) - except pywintypes.error, e: + except pywintypes.error as e: if e[0] != _Win32Opener.FILE_ALREADY_UNLOCKED_ERROR: raise self._locked = False --- python-oauth2client-1.2.orig/oauth2client/multistore_file.py +++ python-oauth2client-1.2/oauth2client/multistore_file.py @@ -271,7 +271,7 @@ class _MultiStore(object): simple version of "touch" to ensure the file has been created. """ if not os.path.exists(self._file.filename()): - old_umask = os.umask(0177) + old_umask = os.umask(0o177) try: open(self._file.filename(), 'a+b').close() finally: --- python-oauth2client-1.2.orig/oauth2client/old_run.py +++ python-oauth2client-1.2/oauth2client/old_run.py @@ -96,20 +96,20 @@ def run(flow, storage, http=None): try: httpd = ClientRedirectServer((FLAGS.auth_host_name, port), ClientRedirectHandler) - except socket.error, e: + except socket.error as e: pass else: success = True break FLAGS.auth_local_webserver = success if not success: - print 'Failed to start a local webserver listening on either port 8080' - print 'or port 9090. Please check your firewall settings and locally' - print 'running programs that may be blocking or using those ports.' - print - print 'Falling back to --noauth_local_webserver and continuing with', - print 'authorization.' - print + print('Failed to start a local webserver listening on either port 8080') + print('or port 9090. Please check your firewall settings and locally') + print('running programs that may be blocking or using those ports.') + print('') + print('Falling back to --noauth_local_webserver and continuing with') + print('authorization.') + print('') if FLAGS.auth_local_webserver: oauth_callback = 'http://%s:%s/' % (FLAGS.auth_host_name, port_number) @@ -120,20 +120,20 @@ def run(flow, storage, http=None): if FLAGS.auth_local_webserver: webbrowser.open(authorize_url, new=1, autoraise=True) - print 'Your browser has been opened to visit:' - print - print ' ' + authorize_url - print - print 'If your browser is on a different machine then exit and re-run' - print 'this application with the command-line parameter ' - print - print ' --noauth_local_webserver' - print + print('Your browser has been opened to visit:') + print('') + print(' ' + authorize_url) + print('') + print('If your browser is on a different machine then exit and re-run') + print('this application with the command-line parameter ') + print('') + print(' --noauth_local_webserver') + print('') else: - print 'Go to the following link in your browser:' - print - print ' ' + authorize_url - print + print('Go to the following link in your browser:') + print('') + print(' ' + authorize_url) + print('') code = None if FLAGS.auth_local_webserver: @@ -143,18 +143,18 @@ def run(flow, storage, http=None): if 'code' in httpd.query_params: code = httpd.query_params['code'] else: - print 'Failed to find "code" in the query parameters of the redirect.' + print('Failed to find "code" in the query parameters of the redirect.') sys.exit('Try running with --noauth_local_webserver.') else: code = raw_input('Enter verification code: ').strip() try: credential = flow.step2_exchange(code, http=http) - except client.FlowExchangeError, e: + except client.FlowExchangeError as e: sys.exit('Authentication has failed: %s' % e) storage.put(credential) credential.set_store(storage) - print 'Authentication successful.' + print('Authentication successful.') return credential --- python-oauth2client-1.2.orig/oauth2client/tools.py +++ python-oauth2client-1.2/oauth2client/tools.py @@ -163,20 +163,20 @@ def run_flow(flow, storage, flags, http= try: httpd = ClientRedirectServer((flags.auth_host_name, port), ClientRedirectHandler) - except socket.error, e: + except socket.error as e: pass else: success = True break flags.noauth_local_webserver = not success if not success: - print 'Failed to start a local webserver listening on either port 8080' - print 'or port 9090. Please check your firewall settings and locally' - print 'running programs that may be blocking or using those ports.' - print - print 'Falling back to --noauth_local_webserver and continuing with', - print 'authorization.' - print + print('Failed to start a local webserver listening on either port 8080') + print('or port 9090. Please check your firewall settings and locally') + print('running programs that may be blocking or using those ports.') + print('') + print('Falling back to --noauth_local_webserver and continuing with') + print('authorization.') + print('') if not flags.noauth_local_webserver: oauth_callback = 'http://%s:%s/' % (flags.auth_host_name, port_number) @@ -187,20 +187,20 @@ def run_flow(flow, storage, flags, http= if not flags.noauth_local_webserver: webbrowser.open(authorize_url, new=1, autoraise=True) - print 'Your browser has been opened to visit:' - print - print ' ' + authorize_url - print - print 'If your browser is on a different machine then exit and re-run this' - print 'application with the command-line parameter ' - print - print ' --noauth_local_webserver' - print + print('Your browser has been opened to visit:') + print('') + print(' ' + authorize_url) + print('') + print('If your browser is on a different machine then exit and re-run this') + print('application with the command-line parameter ') + print('') + print(' --noauth_local_webserver') + print('') else: - print 'Go to the following link in your browser:' - print - print ' ' + authorize_url - print + print('Go to the following link in your browser:') + print('') + print(' ' + authorize_url) + print('') code = None if not flags.noauth_local_webserver: @@ -210,19 +210,19 @@ def run_flow(flow, storage, flags, http= if 'code' in httpd.query_params: code = httpd.query_params['code'] else: - print 'Failed to find "code" in the query parameters of the redirect.' + print('Failed to find "code" in the query parameters of the redirect.') sys.exit('Try running with --noauth_local_webserver.') else: code = raw_input('Enter verification code: ').strip() try: credential = flow.step2_exchange(code, http=http) - except client.FlowExchangeError, e: + except client.FlowExchangeError as e: sys.exit('Authentication has failed: %s' % e) storage.put(credential) credential.set_store(storage) - print 'Authentication successful.' + print('Authentication successful.') return credential