[pypy-commit] pypy py3.3: tkinter: rename TclObject to Tcl_Obj, and expose it

[amauryfa]

Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3.3
Changeset: r75141:778fe234a558
Date: 2014-12-21 10:30 +0100
http://bitbucket.org/pypy/pypy/changeset/778fe234a558/

Log:    tkinter: rename TclObject to Tcl_Obj, and expose it

diff --git a/lib_pypy/_tkinter/__init__.py b/lib_pypy/_tkinter/__init__.py
--- a/lib_pypy/_tkinter/__init__.py
+++ b/lib_pypy/_tkinter/__init__.py
@@ -18,6 +18,7 @@
     raise ImportError("Tk headers and development libraries are required")
 
 from .app import TkApp
+from .tclobj import Tcl_Obj
 
 TK_VERSION = tkffi.string(tklib.get_tk_version()).decode('utf-8')
 TCL_VERSION = tkffi.string(tklib.get_tcl_version()).decode('utf-8')
diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py
--- a/lib_pypy/_tkinter/app.py
+++ b/lib_pypy/_tkinter/app.py
@@ -2,7 +2,7 @@
 
 from .tklib import tklib, tkffi
 from . import TclError
-from .tclobj import TclObject, FromObj, FromTclString, AsObj, TypeCache
+from .tclobj import Tcl_Obj, FromObj, FromTclString, AsObj, TypeCache
 
 import contextlib
 import sys
@@ -24,7 +24,7 @@
 
 
 def varname_converter(input):
-    if isinstance(input, TclObject):
+    if isinstance(input, Tcl_Obj):
         return input.string
     return input.encode('utf-8')
 
@@ -339,7 +339,7 @@
             return FromTclString(result)
 
     def split(self, arg):
-        if isinstance(arg, TclObject):
+        if isinstance(arg, Tcl_Obj):
             objc = tkffi.new("int*")
             objv = tkffi.new("Tcl_Obj***")
             status = tklib.Tcl_ListObjGetElements(self.interp, arg._value, 
objc, objv)
@@ -358,7 +358,7 @@
         return self._split(arg)
 
     def splitlist(self, arg):
-        if isinstance(arg, TclObject):
+        if isinstance(arg, Tcl_Obj):
             objc = tkffi.new("int*")
             objv = tkffi.new("Tcl_Obj***")
             status = tklib.Tcl_ListObjGetElements(self.interp, arg._value, 
objc, objv)
diff --git a/lib_pypy/_tkinter/tclobj.py b/lib_pypy/_tkinter/tclobj.py
--- a/lib_pypy/_tkinter/tclobj.py
+++ b/lib_pypy/_tkinter/tclobj.py
@@ -1,4 +1,4 @@
-# TclObject, conversions with Python objects
+# Tcl_Obj, conversions with Python objects
 
 from .tklib import tklib, tkffi
 
@@ -64,7 +64,7 @@
         buf = tkffi.buffer(tkffi.cast("char*", buf), length*2)[:]
         return buf.decode('utf-16')
 
-    return TclObject(value)
+    return Tcl_Obj(value)
 
 def AsObj(value):
     if isinstance(value, bytes):
@@ -88,13 +88,13 @@
         buf = tkffi.new("char[]", encoded)
         inbuf = tkffi.cast("Tcl_UniChar*", buf)
         return tklib.Tcl_NewUnicodeObj(buf, len(encoded)//2)
-    elif isinstance(value, TclObject):
+    elif isinstance(value, Tcl_Obj):
         tklib.Tcl_IncrRefCount(value._value)
         return value._value
 
     return AsObj(str(value))
 
-class TclObject(object):
+class Tcl_Obj(object):
     def __new__(cls, value):
         self = object.__new__(cls)
         tklib.Tcl_IncrRefCount(value)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit