Work around a Python bug involving the file name 'types.py'.

diff --git a/xcbgen/Makefile.am b/xcbgen/Makefile.am
index 44632fa..110a992 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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
similarity index 100%
rename from xcbgen/types.py
rename to xcbgen/xtypes.py