diff options
Diffstat (limited to 'git_config.py')
| -rw-r--r-- | git_config.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git_config.py b/git_config.py index afaa6f15..ae288558 100644 --- a/git_config.py +++ b/git_config.py | |||
| @@ -449,7 +449,7 @@ def _open_ssh(host, port=None): | |||
| 449 | try: | 449 | try: |
| 450 | Trace(': %s', ' '.join(command)) | 450 | Trace(': %s', ' '.join(command)) |
| 451 | p = subprocess.Popen(command) | 451 | p = subprocess.Popen(command) |
| 452 | except Exception, e: | 452 | except Exception as e: |
| 453 | _ssh_master = False | 453 | _ssh_master = False |
| 454 | print >>sys.stderr, \ | 454 | print >>sys.stderr, \ |
| 455 | '\nwarn: cannot enable ssh control master for %s:%s\n%s' \ | 455 | '\nwarn: cannot enable ssh control master for %s:%s\n%s' \ |
| @@ -592,9 +592,9 @@ class Remote(object): | |||
| 592 | else: | 592 | else: |
| 593 | host, port = info.split() | 593 | host, port = info.split() |
| 594 | self._review_url = self._SshReviewUrl(userEmail, host, port) | 594 | self._review_url = self._SshReviewUrl(userEmail, host, port) |
| 595 | except urllib2.HTTPError, e: | 595 | except urllib2.HTTPError as e: |
| 596 | raise UploadError('%s: %s' % (self.review, str(e))) | 596 | raise UploadError('%s: %s' % (self.review, str(e))) |
| 597 | except urllib2.URLError, e: | 597 | except urllib2.URLError as e: |
| 598 | raise UploadError('%s: %s' % (self.review, str(e))) | 598 | raise UploadError('%s: %s' % (self.review, str(e))) |
| 599 | 599 | ||
| 600 | REVIEW_CACHE[u] = self._review_url | 600 | REVIEW_CACHE[u] = self._review_url |
