Skip to content

Commit da27aaf

Browse files
authored
remove dead optional for_stub arg (enthought#489)
from `ImportedNamespaces.getvalue`
1 parent 65e3c10 commit da27aaf

File tree

1 file changed

+8
-29
lines changed

1 file changed

+8
-29
lines changed

comtypes/tools/codegenerator.py

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,21 +1388,6 @@ def add(self, name1, name2=None, symbols=None):
13881388
... 'Decimal', 'GUID', 'COMMETHOD', 'DISPMETHOD', 'IUnknown',
13891389
... 'dispid', 'CoClass', 'BSTR', 'DISPPROPERTY'
13901390
... }
1391-
>>> print(imports.getvalue(for_stub=True))
1392-
from ctypes import *
1393-
import datetime
1394-
from decimal import Decimal as Decimal
1395-
from comtypes import (
1396-
BSTR as BSTR,
1397-
CoClass as CoClass,
1398-
COMMETHOD as COMMETHOD,
1399-
dispid as dispid,
1400-
DISPMETHOD as DISPMETHOD,
1401-
DISPPROPERTY as DISPPROPERTY,
1402-
GUID as GUID,
1403-
IUnknown as IUnknown,
1404-
)
1405-
import ctypes.wintypes
14061391
"""
14071392
if name2 is None:
14081393
import_ = name1
@@ -1448,25 +1433,19 @@ def get_symbols(self) -> Set[str]:
14481433
names.add(key)
14491434
return names
14501435

1451-
def _make_line(self, from_, imports, for_stub):
1452-
if for_stub:
1453-
import_ = ", ".join("%s as %s" % (n, n) for n in imports)
1454-
else:
1455-
import_ = ", ".join(imports)
1436+
def _make_line(self, from_, imports):
1437+
import_ = ", ".join(imports)
14561438
code = "from %s import %s" % (from_, import_)
14571439
if len(code) <= 80:
14581440
return code
1459-
if for_stub:
1460-
import_ = "\n".join(" %s as %s," % (n, n) for n in imports)
1461-
else:
1462-
wrapper = textwrap.TextWrapper(
1463-
subsequent_indent=" ", initial_indent=" ", break_long_words=False
1464-
)
1465-
import_ = "\n".join(wrapper.wrap(import_))
1441+
wrapper = textwrap.TextWrapper(
1442+
subsequent_indent=" ", initial_indent=" ", break_long_words=False
1443+
)
1444+
import_ = "\n".join(wrapper.wrap(import_))
14661445
code = "from %s import (\n%s\n)" % (from_, import_)
14671446
return code
14681447

1469-
def getvalue(self, for_stub=False):
1448+
def getvalue(self):
14701449
ns = {}
14711450
lines = []
14721451
for key, val in self.data.items():
@@ -1481,7 +1460,7 @@ def getvalue(self, for_stub=False):
14811460
lines.append("import %s" % key)
14821461
else:
14831462
names = sorted(val, key=lambda s: s.lower())
1484-
lines.append(self._make_line(key, names, for_stub=for_stub))
1463+
lines.append(self._make_line(key, names))
14851464
return "\n".join(lines)
14861465

14871466

0 commit comments

Comments
 (0)