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

Jump to bottom

Support empy3 and empy4 #821

Merged
merged 7 commits into from
Aug 22, 2024
Merged

Support empy3 and empy4 #821

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0accfa0
Support empy3 and empy4
ahcorde Aug 1, 2024
6eed931
Added feedback
ahcorde Aug 1, 2024
7951d47
make linters happy
ahcorde Aug 1, 2024
83cca77
Remove some debugging code.
clalancette Aug 7, 2024
c20cea3
Fixed stdout
ahcorde Aug 20, 2024
093f829
Removed trace
ahcorde Aug 21, 2024
761d831
Include feedback
ahcorde Aug 21, 2024
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
43 changes: 33 additions & 10 deletions rosidl_adapter/rosidl_adapter/resource/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@

import em

try:
from em import Configuration
em_has_configuration = True
except ImportError:
em_has_configuration = False


def expand_template(template_name, data, output_file, encoding='utf-8'):
content = evaluate_template(template_name, data)
Expand Down Expand Up @@ -45,18 +51,31 @@ def evaluate_template(template_name, data):

output = StringIO()
try:
_interpreter = em.Interpreter(
output=output,
options={
em.BUFFERED_OPT: True,
em.RAW_OPT: True,
})

if em_has_configuration:
config = Configuration(
defaultRoot=template_path,
defaultStdout=output,
deleteOnError=True,
rawErrors=True,
useProxy=True)
_interpreter = em.Interpreter(
config=config,
dispatcher=False)
else:
_interpreter = em.Interpreter(
output=output,
options={
em.BUFFERED_OPT: True,
em.RAW_OPT: True,
})
with open(template_path, 'r') as h:
content = h.read()
_interpreter.invoke(
'beforeFile', name=template_name, file=h, locals=data)
_interpreter.string(content, template_path, locals=data)
if em_has_configuration:
_interpreter.string(content, locals=data)
else:
_interpreter.string(content, template_path, locals=data)
_interpreter.invoke('afterFile')

return output.getvalue()
Expand All @@ -66,7 +85,8 @@ def evaluate_template(template_name, data):
file=sys.stderr)
raise
finally:
_interpreter.shutdown()
if _interpreter is not None:
_interpreter.shutdown()
_interpreter = None


Expand All @@ -78,7 +98,10 @@ def _evaluate_template(template_name, **kwargs):
'beforeInclude', name=template_path, file=h, locals=kwargs)
content = h.read()
try:
_interpreter.string(content, template_path, kwargs)
if em_has_configuration:
_interpreter.string(content, locals=kwargs)
else:
_interpreter.string(content, template_path, kwargs)
except Exception as e: # noqa: F841
print(
f"{e.__class__.__name__} processing template '{template_name}': "
Expand Down
48 changes: 36 additions & 12 deletions rosidl_pycommon/rosidl_pycommon/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
import sys

import em

try:
from em import Configuration
em_has_configuration = True
except ImportError:
em_has_configuration = False

from rosidl_parser.definition import IdlLocator
from rosidl_parser.parser import parse_idl_file

Expand Down Expand Up @@ -146,20 +153,31 @@ def expand_template(
template_basepath = template_name.parent
template_name = template_name.name

global interpreter
output = StringIO()
interpreter = em.Interpreter(
output=output,
options={
em.BUFFERED_OPT: True,
em.RAW_OPT: True,
},
)

global template_prefix_path
template_prefix_path.append(template_basepath)
template_path = get_template_path(template_name)

global interpreter
output = StringIO()
if em_has_configuration:
config = Configuration(
defaultRoot=template_path,
defaultStdout=output,
deleteOnError=True,
rawErrors=True,
useProxy=True)
interpreter = em.Interpreter(
config=config,
dispatcher=False)
else:
interpreter = em.Interpreter(
output=output,
options={
em.BUFFERED_OPT: True,
em.RAW_OPT: True,
},
)

# create copy before manipulating
data = dict(data)
_add_helper_functions(data)
Expand All @@ -169,7 +187,10 @@ def expand_template(
template_content = h.read()
interpreter.invoke(
'beforeFile', name=template_name, file=h, locals=data)
interpreter.string(template_content, template_path, locals=data)
if em_has_configuration:
interpreter.string(template_content, locals=data)
else:
interpreter.string(template_content, template_path, locals=data)
interpreter.invoke('afterFile')
except Exception as e: # noqa: F841
if os.path.exists(output_file):
Expand Down Expand Up @@ -218,7 +239,10 @@ def _expand_template(template_name, **kwargs):
'beforeInclude', name=str(template_path), file=h, locals=kwargs)
content = h.read()
try:
interpreter.string(content, str(template_path), kwargs)
if em_has_configuration:
interpreter.string(content, locals=kwargs)
else:
interpreter.string(content, str(template_path), kwargs)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I just noticed one more thing. This looks different from both line 243, and line 193 above. I'm wondering if we should just make this consistent with everything else:

Suggested change
interpreter.string(content, str(template_path), kwargs)
interpreter.string(content, template_path, locals=kwargs)

What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

761d831

except Exception as e: # noqa: F841
print(f"{e.__class__.__name__} in template '{template_path}': {e}",
file=sys.stderr)
Expand Down
Loading