diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-07-09 13:41:10 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2008-07-09 13:41:10 -0400 |
| commit | bf652a63fe0de259857ed174d7e921d645184634 (patch) | |
| tree | cadf6f0d4bd2d3f28daa231187e1eaaf7b061707 /xcbgen | |
| parent | 3e8dbef32e691150ca1c86a2bccfd4458ef16190 (diff) | |
Work around a Python bug involving the file name 'types.py'.
Diffstat (limited to 'xcbgen')
| -rw-r--r-- | xcbgen/Makefile.am | 2 | ||||
| -rw-r--r-- | xcbgen/matcher.py | 2 | ||||
| -rw-r--r-- | xcbgen/state.py | 2 | ||||
| -rw-r--r-- | xcbgen/xtypes.py (renamed from xcbgen/types.py) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/xcbgen/Makefile.am b/xcbgen/Makefile.am index 44632fa..110a992 100644 --- a/xcbgen/Makefile.am +++ b/xcbgen/Makefile.am @@ -1,3 +1,3 @@ pkgpythondir = $(pythondir)/xcbgen -pkgpython_PYTHON = __init__.py error.py expr.py matcher.py state.py types.py +pkgpython_PYTHON = __init__.py error.py expr.py matcher.py state.py xtypes.py diff --git a/xcbgen/matcher.py b/xcbgen/matcher.py index b2d9b8b..e7958fa 100644 --- a/xcbgen/matcher.py +++ b/xcbgen/matcher.py @@ -10,7 +10,7 @@ from os.path import join from xml.etree.cElementTree import parse import state -from types import * +from xtypes import * def import_(node, module, namespace): ''' diff --git a/xcbgen/state.py b/xcbgen/state.py index 59b5608..51efc94 100644 --- a/xcbgen/state.py +++ b/xcbgen/state.py @@ -6,7 +6,7 @@ from xml.etree.cElementTree import parse import matcher from error import * -from types import * +from xtypes import * import __main__ diff --git a/xcbgen/types.py b/xcbgen/xtypes.py index d4b16e2..d4b16e2 100644 --- a/xcbgen/types.py +++ b/xcbgen/xtypes.py |