Commit 9eda3aeb authored by Fred Drake's avatar Fred Drake

Simplify a helper by returning fewer values.

parent cc91ac09
...@@ -185,11 +185,10 @@ class Conversion: ...@@ -185,11 +185,10 @@ class Conversion:
if topentry.outputname: if topentry.outputname:
self.write(")%s\n-\\n\n" % topentry.outputname) self.write(")%s\n-\\n\n" % topentry.outputname)
# #
if entry.outputname: if entry.outputname and entry.empty:
if entry.empty:
self.write("e\n") self.write("e\n")
# #
params, optional, empty, environ = self.start_macro(macroname) params, optional, empty = self.start_macro(macroname)
# rip off the macroname # rip off the macroname
if params: if params:
line = line[m.end(1):] line = line[m.end(1):]
...@@ -363,7 +362,7 @@ class Conversion: ...@@ -363,7 +362,7 @@ class Conversion:
conversion = self.get_entry(name) conversion = self.get_entry(name)
parameters = conversion.parameters parameters = conversion.parameters
optional = parameters and parameters[0].optional optional = parameters and parameters[0].optional
return parameters, optional, conversion.empty, conversion.environment return parameters, optional, conversion.empty
def get_entry(self, name): def get_entry(self, name):
entry = self.table.get(name) entry = self.table.get(name)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment