Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for backwards incompatible change in AST library #353

Merged
merged 3 commits into from
Feb 21, 2020
Merged

Fix for backwards incompatible change in AST library #353

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb7a18a
Fix backwards incompatible change in AST library
lkluft Feb 18, 2020
4cc08c5
Remove unused imports
lkluft Feb 18, 2020
11c4166
Reformat imports
lkluft Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions typhon/arts/workspace/workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,29 @@
"""
import ctypes as c
import logging
import numpy as np

import ast
from ast import iter_child_nodes, parse, NodeVisitor, Call, Attribute, Name, \
Expression, Expr, FunctionDef, Starred, Module, expr
from inspect import getsource, getclosurevars
from contextlib import contextmanager
from copy import copy
from functools import wraps
import sys

from ast import parse, Call, Name, Expression, Expr, FunctionDef, Starred, Module
from inspect import getsource, getclosurevars
from copy import copy
import os

from typhon.arts.workspace.api import arts_api, VariableValueStruct, \
data_path_push, data_path_pop, \
include_path_push, include_path_pop
from typhon.arts.workspace.methods import WorkspaceMethod, workspace_methods
from typhon.arts.workspace.variables import WorkspaceVariable, group_names, group_ids, \
workspace_variables
from typhon.arts.workspace.agendas import Agenda
from typhon.arts.workspace import variables as V
from typhon.arts.workspace.api import (
arts_api,
VariableValueStruct,
data_path_push,
data_path_pop,
include_path_push,
include_path_pop,
)
from typhon.arts.workspace.methods import workspace_methods
from typhon.arts.workspace.variables import (
WorkspaceVariable,
group_names,
group_ids,
workspace_variables,
)
from typhon.arts.workspace.agendas import Agenda
from typhon.arts.workspace.output import CoutCapture
from typhon.arts.workspace.utility import unindent

Expand Down Expand Up @@ -126,7 +130,11 @@ def callback_make_fun(body):
Helper function that creates a wrapper function around
python code to be executed withing an ARTS agenda.
"""
m = Module(body)
if sys.version_info >= (3, 8):
# https://bugs.python.org/issue35894#msg334808
m = Module(body, [])
else:
m = Module(body)

def callback(ptr):
try:
Expand Down