Author: Armin Rigo <[email protected]>
Branch: 
Changeset: r75849:55c0915afc7a
Date: 2015-02-13 11:17 +0100
http://bitbucket.org/pypy/pypy/changeset/55c0915afc7a/

Log:    issue #1982

        quick fix: rename _names to _pyctypes__names.

diff --git a/lib_pypy/_ctypes/structure.py b/lib_pypy/_ctypes/structure.py
--- a/lib_pypy/_ctypes/structure.py
+++ b/lib_pypy/_ctypes/structure.py
@@ -60,7 +60,7 @@
             is_bitfield = (len(field) == 3)
             startpos = self._ffistruct.fieldoffset(name)
             if name in anonymous_fields:
-                for subname in value._names:
+                for subname in value._pyctypes__names:
                     resnames.append(subname)
                     subfield = getattr(value, subname)
                     relpos = startpos + subfield.offset
@@ -71,7 +71,7 @@
             else:
                 resnames.append(name)
         names = resnames
-    self._names = names
+    self._pyctypes__names = names
     for name, field in fields.items():
         setattr(self, name, field)
 
@@ -230,9 +230,9 @@
 
     def __init__(self, *args, **kwds):
         type(self)._make_final()
-        if len(args) > len(self._names):
+        if len(args) > len(self._pyctypes__names):
             raise TypeError("too many initializers")
-        for name, arg in zip(self._names, args):
+        for name, arg in zip(self._pyctypes__names, args):
             if name in kwds:
                 raise TypeError("duplicate value for argument %r" % (
                     name,))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to