[pypy-commit] pypy refactor-buffer-api: Avoid naming clash.

[Manuel Jacob]

Author: Manuel Jacob
Branch: refactor-buffer-api
Changeset: r66439:966956ebeb21
Date: 2013-08-30 01:30 +0100
http://bitbucket.org/pypy/pypy/changeset/966956ebeb21/

Log:    Avoid naming clash.

diff --git a/pypy/module/pyexpat/interp_pyexpat.py 
b/pypy/module/pyexpat/interp_pyexpat.py
--- a/pypy/module/pyexpat/interp_pyexpat.py
+++ b/pypy/module/pyexpat/interp_pyexpat.py
@@ -429,7 +429,7 @@
 
         self.handlers = [None] * NB_HANDLERS
 
-        self.buffer_w = None
+        self.buffer_w_ = None
         self.buffer_size = 8192
         self.buffer_used = 0
         self.w_character_data_handler = None
@@ -541,7 +541,7 @@
 
     def buffer_string(self, space, w_string, length):
         ll_length = rffi.cast(lltype.Signed, length)
-        if self.buffer_w is not None:
+        if self.buffer_w_ is not None:
             if self.buffer_used + ll_length > self.buffer_size:
                 self.flush_character_buffer(space)
                 # handler might have changed; drop the rest on the floor
@@ -549,11 +549,11 @@
                 if self.w_character_data_handler is None:
                     return True
             if ll_length <= self.buffer_size:
-                self.buffer_w.append(w_string)
+                self.buffer_w_.append(w_string)
                 self.buffer_used += ll_length
                 return True
             else:
-                self.buffer_w = []
+                self.buffer_w_ = []
                 self.buffer_used = 0
         return False
 
@@ -681,12 +681,12 @@
         return space.wrap(parser)
 
     def flush_character_buffer(self, space):
-        if not self.buffer_w:
+        if not self.buffer_w_:
             return
         w_data = space.call_function(
             space.getattr(space.wrap(''), space.wrap('join')),
-            space.newlist(self.buffer_w))
-        self.buffer_w = []
+            space.newlist(self.buffer_w_))
+        self.buffer_w_ = []
         self.buffer_used = 0
 
         if self.w_character_data_handler:
@@ -731,14 +731,14 @@
         self.buffer_size = value
 
     def get_buffer_text(self, space):
-        return space.wrap(self.buffer_w is not None)
+        return space.wrap(self.buffer_w_ is not None)
     def set_buffer_text(self, space, w_value):
         if space.is_true(w_value):
-            self.buffer_w = []
+            self.buffer_w_ = []
             self.buffer_used = 0
         else:
             self.flush_character_buffer(space)
-            self.buffer_w = None
+            self.buffer_w_ = None
 
     def get_intern(self, space):
         if self.w_intern:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit