diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 21:18:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 22:28:24 +0100 |
| commit | 3e86a6cddef330e08170887104f0aebae96183a6 (patch) | |
| tree | 02e68be267226ac96ca7ff5bcf56927b665c8733 /bitbake | |
| parent | a823c888391223b25f152f6e135cc0403677c324 (diff) | |
| download | poky-3e86a6cddef330e08170887104f0aebae96183a6.tar.gz | |
bitbake: lib: Use modern expcetion syntax
(Bitbake rev: a4a37b6a83faa62f61433122c4583e93e64f7372)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/compat.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/process.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/siggen.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/compat.py b/bitbake/lib/bb/compat.py index ea4e23a008..440a2fbc8b 100644 --- a/bitbake/lib/bb/compat.py +++ b/bitbake/lib/bb/compat.py | |||
| @@ -343,7 +343,7 @@ def worker(inqueue, outqueue, initializer=None, initargs=(), maxtasks=None): | |||
| 343 | job, i, func, args, kwds = task | 343 | job, i, func, args, kwds = task |
| 344 | try: | 344 | try: |
| 345 | result = (True, func(*args, **kwds)) | 345 | result = (True, func(*args, **kwds)) |
| 346 | except Exception, e: | 346 | except Exception as e: |
| 347 | result = (False, e) | 347 | result = (False, e) |
| 348 | try: | 348 | try: |
| 349 | put((job, i, result)) | 349 | put((job, i, result)) |
diff --git a/bitbake/lib/bb/process.py b/bitbake/lib/bb/process.py index 1aeec788c1..afc8e9bd49 100644 --- a/bitbake/lib/bb/process.py +++ b/bitbake/lib/bb/process.py | |||
| @@ -85,7 +85,7 @@ def _logged_communicate(pipe, log, input): | |||
| 85 | rlist = rin | 85 | rlist = rin |
| 86 | try: | 86 | try: |
| 87 | r,w,e = select.select (rlist, [], []) | 87 | r,w,e = select.select (rlist, [], []) |
| 88 | except OSError, e: | 88 | except OSError as e: |
| 89 | if e.errno != errno.EINTR: | 89 | if e.errno != errno.EINTR: |
| 90 | raise | 90 | raise |
| 91 | 91 | ||
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index dece945969..1ff2ecc482 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
| @@ -249,7 +249,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
| 249 | os.fsync(fd) | 249 | os.fsync(fd) |
| 250 | os.chmod(tmpfile, 0664) | 250 | os.chmod(tmpfile, 0664) |
| 251 | os.rename(tmpfile, sigfile) | 251 | os.rename(tmpfile, sigfile) |
| 252 | except (OSError, IOError), err: | 252 | except (OSError, IOError) as err: |
| 253 | try: | 253 | try: |
| 254 | os.unlink(tmpfile) | 254 | os.unlink(tmpfile) |
| 255 | except OSError: | 255 | except OSError: |
