| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # coding: utf-8 | 2 # coding: utf-8 |
| 3 # | 3 # |
| 4 # Copyright 2007 Google Inc. | 4 # Copyright 2007 Google Inc. |
| 5 # | 5 # |
| 6 # Licensed under the Apache License, Version 2.0 (the "License"); | 6 # Licensed under the Apache License, Version 2.0 (the "License"); |
| 7 # you may not use this file except in compliance with the License. | 7 # you may not use this file except in compliance with the License. |
| 8 # You may obtain a copy of the License at | 8 # You may obtain a copy of the License at |
| 9 # | 9 # |
| 10 # http://www.apache.org/licenses/LICENSE-2.0 | 10 # http://www.apache.org/licenses/LICENSE-2.0 |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 print "Failed to get password from keyring" | 632 print "Failed to get password from keyring" |
| 633 keyring = None | 633 keyring = None |
| 634 if password is not None: | 634 if password is not None: |
| 635 print "Using password from system keyring." | 635 print "Using password from system keyring." |
| 636 self.accounts_seen.add(email) | 636 self.accounts_seen.add(email) |
| 637 else: | 637 else: |
| 638 password = getpass.getpass("Password for %s: " % email) | 638 password = getpass.getpass("Password for %s: " % email) |
| 639 if keyring: | 639 if keyring: |
| 640 answer = raw_input("Store password in system keyring?(y/N) ").strip() | 640 answer = raw_input("Store password in system keyring?(y/N) ").strip() |
| 641 if answer == "y": | 641 if answer == "y": |
| 642 keyring.set_password(host, email, password) | 642 keyring.set_password(self.host, email, password) |
| 643 self.accounts_seen.add(email) | 643 self.accounts_seen.add(email) |
| 644 return (email, password) | 644 return (email, password) |
| 645 | 645 |
| 646 | 646 |
| 647 def GetRpcServer(server, email=None, host_override=None, save_cookies=True, | 647 def GetRpcServer(server, email=None, host_override=None, save_cookies=True, |
| 648 account_type=AUTH_ACCOUNT_TYPE): | 648 account_type=AUTH_ACCOUNT_TYPE): |
| 649 """Returns an instance of an AbstractRpcServer. | 649 """Returns an instance of an AbstractRpcServer. |
| 650 | 650 |
| 651 Args: | 651 Args: |
| 652 server: String containing the review server URL. | 652 server: String containing the review server URL. |
| (...skipping 1718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2371 os.environ['LC_ALL'] = 'C' | 2371 os.environ['LC_ALL'] = 'C' |
| 2372 RealMain(sys.argv) | 2372 RealMain(sys.argv) |
| 2373 except KeyboardInterrupt: | 2373 except KeyboardInterrupt: |
| 2374 print | 2374 print |
| 2375 StatusUpdate("Interrupted.") | 2375 StatusUpdate("Interrupted.") |
| 2376 sys.exit(1) | 2376 sys.exit(1) |
| 2377 | 2377 |
| 2378 | 2378 |
| 2379 if __name__ == "__main__": | 2379 if __name__ == "__main__": |
| 2380 main() | 2380 main() |
| OLD | NEW |