diff options
| author | bsimon <bsimon@stsci.edu> | 2015-05-21 14:58:13 -0400 |
|---|---|---|
| committer | bsimon <bsimon@stsci.edu> | 2015-05-21 14:58:13 -0400 |
| commit | 01b9e5690f2c2d7a3d0c729217c0cf2343227911 (patch) | |
| tree | bde60685cae7a48b5ce8f05094644d4a8f1681d4 /lib/stwcs/wcsutil/headerlet.py | |
| parent | a6164f4bbcdef912eb583bd2e4038a1e8e4951da (diff) | |
| download | stwcs_hcf-01b9e5690f2c2d7a3d0c729217c0cf2343227911.tar.gz | |
Fixed problems with python 2 to 3 conversion
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stwcs/trunk@40220 fe389314-cf27-0410-b35b-8c050e845b92
Diffstat (limited to 'lib/stwcs/wcsutil/headerlet.py')
| -rw-r--r-- | lib/stwcs/wcsutil/headerlet.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/stwcs/wcsutil/headerlet.py b/lib/stwcs/wcsutil/headerlet.py index 6b3e752..c0dd9b0 100644 --- a/lib/stwcs/wcsutil/headerlet.py +++ b/lib/stwcs/wcsutil/headerlet.py @@ -109,12 +109,14 @@ def with_logging(func): level = kw.get('logging', 100) mode = kw.get('logmode', 'w') func_args = kw.copy() - if sys.version_info[0] < 3: - for argname, arg in zip(func.func_code.co_varnames, args): - func_args[argname] = arg + if sys.version_info[0] >= 3: + argnames = func.__code__.co_varnames else: - for argname, arg in zip(func.__code__.co_varnames, args): - func_args[argname] = arg + argnames = func.func_code.co_varnames + + for argname, arg in zip(argnames, args): + func_args[argname] = arg + init_logging(func.__name__, level, mode, **func_args) return func(*args, **kw) return wrapped @@ -157,7 +159,7 @@ def parse_filename(fname, mode='readonly'): """ close_fobj = False if not isinstance(fname, list): - if sys.version > '3': + if sys.version_info[0] >= 3: is_string = isinstance(fname, str) else: is_string = isinstance(fname, basestring) @@ -1493,7 +1495,7 @@ def restore_from_headerlet(filename, hdrname=None, hdrext=None, archive=True, priwcs_name = None scihdr = extlist[0].header - #sci_wcsnames = altwcs.wcsnames(scihdr).values() + sci_wcsnames = altwcs.wcsnames(scihdr).values() if 'hdrname' in scihdr: priwcs_hdrname = scihdr['hdrname'] else: |