Also throws away translations from repr().
# HG changeset patch
# User ZyX <[email protected]>
# Date 1369552294 -14400
# Node ID abd30ecabb334396aabab4b284b008d57cbedd16
# Parent 542435007988a8d87b3739506422ebc7d58f3910
Use PyString_FromFormat to generate strings, throw away translations
diff -r 542435007988 -r abd30ecabb33 src/if_py_both.h
--- a/src/if_py_both.h Sun May 26 10:35:31 2013 +0400
+++ b/src/if_py_both.h Sun May 26 11:11:34 2013 +0400
@@ -2006,24 +2006,17 @@
static PyObject *
TabPageRepr(TabPageObject *self)
{
- static char repr[100];
-
if (self->tab == INVALID_TABPAGE_VALUE)
- {
- vim_snprintf(repr, 100, _("<tabpage object (deleted) at %p>"), (self));
- return PyString_FromString(repr);
- }
+ return PyString_FromFormat("<tabpage object (deleted) at %p>", (self));
else
{
int t = get_tab_number(self->tab);
if (t == 0)
- vim_snprintf(repr, 100, _("<tabpage object (unknown) at %p>"),
- (self));
+ return PyString_FromFormat("<tabpage object (unknown) at %p>",
+ (self));
else
- vim_snprintf(repr, 100, _("<tabpage %d>"), t - 1);
-
- return PyString_FromString(repr);
+ return PyString_FromFormat("<tabpage %d>", t - 1);
}
}
@@ -2344,24 +2337,17 @@
static PyObject *
WindowRepr(WindowObject *self)
{
- static char repr[100];
-
if (self->win == INVALID_WINDOW_VALUE)
- {
- vim_snprintf(repr, 100, _("<window object (deleted) at %p>"), (self));
- return PyString_FromString(repr);
- }
+ return PyString_FromFormat("<window object (deleted) at %p>", (self));
else
{
int w = get_win_number(self->win, firstwin);
if (w == 0)
- vim_snprintf(repr, 100, _("<window object (unknown) at %p>"),
+ return PyString_FromFormat("<window object (unknown) at %p>",
(self));
else
- vim_snprintf(repr, 100, _("<window %d>"), w - 1);
-
- return PyString_FromString(repr);
+ return PyString_FromFormat("<window %d>", w - 1);
}
}
@@ -3281,31 +3267,18 @@
static PyObject *
RangeRepr(RangeObject *self)
{
- static char repr[100];
-
if (self->buf->buf == INVALID_BUFFER_VALUE)
- {
- vim_snprintf(repr, 100, "<range object (for deleted buffer) at %p>",
- (self));
- return PyString_FromString(repr);
- }
+ return PyString_FromFormat("<range object (for deleted buffer) at %p>",
+ (self));
else
{
char *name = (char *)self->buf->buf->b_fname;
- int len;
if (name == NULL)
name = "";
- len = (int)strlen(name);
-
- if (len > 45)
- name = name + (45 - len);
-
- vim_snprintf(repr, 100, "<range %s%s (%d:%d)>",
- len > 45 ? "..." : "", name,
- self->start, self->end);
-
- return PyString_FromString(repr);
+
+ return PyString_FromFormat("<range %s (%d:%d)>",
+ name, self->start, self->end);
}
}
@@ -3533,28 +3506,16 @@
static PyObject *
BufferRepr(BufferObject *self)
{
- static char repr[100];
-
if (self->buf == INVALID_BUFFER_VALUE)
- {
- vim_snprintf(repr, 100, _("<buffer object (deleted) at %p>"), (self));
- return PyString_FromString(repr);
- }
+ return PyString_FromFormat("<buffer object (deleted) at %p>", self);
else
{
- char *name = (char *)self->buf->b_fname;
- PyInt len;
+ char *name = (char *)self->buf->b_fname;
if (name == NULL)
name = "";
- len = strlen(name);
-
- if (len > 35)
- name = name + (35 - len);
-
- vim_snprintf(repr, 100, "<buffer %s%s>", len > 35 ? "..." : "", name);
-
- return PyString_FromString(repr);
+
+ return PyString_FromFormat("<buffer %s>", name);
}
}
diff -r 542435007988 -r abd30ecabb33 src/if_python.c
--- a/src/if_python.c Sun May 26 10:35:31 2013 +0400
+++ b/src/if_python.c Sun May 26 11:11:34 2013 +0400
@@ -212,6 +212,7 @@
# define PyString_AsString dll_PyString_AsString
# define PyString_AsStringAndSize dll_PyString_AsStringAndSize
# define PyString_FromString dll_PyString_FromString
+# define PyString_FromFormat dll_PyString_FromFormat
# define PyString_FromStringAndSize dll_PyString_FromStringAndSize
# define PyString_Size dll_PyString_Size
# define PyString_Type (*dll_PyString_Type)
@@ -340,6 +341,7 @@
static char*(*dll_PyString_AsString)(PyObject *);
static int(*dll_PyString_AsStringAndSize)(PyObject *, char **, int *);
static PyObject*(*dll_PyString_FromString)(const char *);
+static PyObject*(*dll_PyString_FromFormat)(const char *, ...);
static PyObject*(*dll_PyString_FromStringAndSize)(const char *, PyInt);
static PyInt(*dll_PyString_Size)(PyObject *);
static PyTypeObject* dll_PyString_Type;
@@ -499,6 +501,7 @@
{"PyString_AsString", (PYTHON_PROC*)&dll_PyString_AsString},
{"PyString_AsStringAndSize", (PYTHON_PROC*)&dll_PyString_AsStringAndSize},
{"PyString_FromString", (PYTHON_PROC*)&dll_PyString_FromString},
+ {"PyString_FromFormat", (PYTHON_PROC*)&dll_PyString_FromFormat},
{"PyString_FromStringAndSize",
(PYTHON_PROC*)&dll_PyString_FromStringAndSize},
{"PyString_Size", (PYTHON_PROC*)&dll_PyString_Size},
{"PyString_Type", (PYTHON_PROC*)&dll_PyString_Type},
diff -r 542435007988 -r abd30ecabb33 src/if_python3.c
--- a/src/if_python3.c Sun May 26 10:35:31 2013 +0400
+++ b/src/if_python3.c Sun May 26 11:11:34 2013 +0400
@@ -90,6 +90,7 @@
#define PyString_AsString(obj) PyBytes_AsString(obj)
#define PyString_Size(obj) PyBytes_GET_SIZE(bytes)
#define PyString_FromString(repr) PyUnicode_FromString(repr)
+#define PyString_FromFormat PyUnicode_FromFormat
#define PyString_AsStringAndSize(obj, buffer, len)
PyBytes_AsStringAndSize(obj, buffer, len)
#define PyInt_Check(obj) PyLong_Check(obj)
#define PyInt_FromLong(i) PyLong_FromLong(i)
@@ -230,6 +231,7 @@
# define PyType_GenericNew py3_PyType_GenericNew
# undef PyUnicode_FromString
# define PyUnicode_FromString py3_PyUnicode_FromString
+# define PyUnicode_FromFormat py3_PyUnicode_FromFormat
# undef PyUnicode_Decode
# define PyUnicode_Decode py3_PyUnicode_Decode
# define PyType_IsSubtype py3_PyType_IsSubtype
@@ -293,6 +295,7 @@
static int (*py3_PyType_Ready)(PyTypeObject *type);
static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject
*item);
static PyObject* (*py3_PyUnicode_FromString)(const char *u);
+static PyObject* (*py3_PyUnicode_FromFormat)(const char *u, ...);
static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size,
const char *encoding, const char *errors);
static long (*py3_PyLong_AsLong)(PyObject *);
@@ -458,6 +461,7 @@
# else
{"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
# endif
+ {"PyUnicode_FromFormat", (PYTHON_PROC*)&py3_PyUnicode_FromFormat},
{"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
{"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize},
{"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
diff -cr vim.542435007988/src/if_py_both.h vim.abd30ecabb33/src/if_py_both.h
*** vim.542435007988/src/if_py_both.h 2013-05-26 12:12:13.270144231 +0400
--- vim.abd30ecabb33/src/if_py_both.h 2013-05-26 12:12:13.282144118 +0400
***************
*** 2006,2029 ****
static PyObject *
TabPageRepr(TabPageObject *self)
{
- static char repr[100];
-
if (self->tab == INVALID_TABPAGE_VALUE)
! {
! vim_snprintf(repr, 100, _("<tabpage object (deleted) at %p>"), (self));
! return PyString_FromString(repr);
! }
else
{
int t = get_tab_number(self->tab);
if (t == 0)
! vim_snprintf(repr, 100, _("<tabpage object (unknown) at %p>"),
! (self));
else
! vim_snprintf(repr, 100, _("<tabpage %d>"), t - 1);
!
! return PyString_FromString(repr);
}
}
--- 2006,2022 ----
static PyObject *
TabPageRepr(TabPageObject *self)
{
if (self->tab == INVALID_TABPAGE_VALUE)
! return PyString_FromFormat("<tabpage object (deleted) at %p>", (self));
else
{
int t = get_tab_number(self->tab);
if (t == 0)
! return PyString_FromFormat("<tabpage object (unknown) at %p>",
! (self));
else
! return PyString_FromFormat("<tabpage %d>", t - 1);
}
}
***************
*** 2344,2367 ****
static PyObject *
WindowRepr(WindowObject *self)
{
- static char repr[100];
-
if (self->win == INVALID_WINDOW_VALUE)
! {
! vim_snprintf(repr, 100, _("<window object (deleted) at %p>"), (self));
! return PyString_FromString(repr);
! }
else
{
int w = get_win_number(self->win, firstwin);
if (w == 0)
! vim_snprintf(repr, 100, _("<window object (unknown) at %p>"),
(self));
else
! vim_snprintf(repr, 100, _("<window %d>"), w - 1);
!
! return PyString_FromString(repr);
}
}
--- 2337,2353 ----
static PyObject *
WindowRepr(WindowObject *self)
{
if (self->win == INVALID_WINDOW_VALUE)
! return PyString_FromFormat("<window object (deleted) at %p>", (self));
else
{
int w = get_win_number(self->win, firstwin);
if (w == 0)
! return PyString_FromFormat("<window object (unknown) at %p>",
(self));
else
! return PyString_FromFormat("<window %d>", w - 1);
}
}
***************
*** 3281,3311 ****
static PyObject *
RangeRepr(RangeObject *self)
{
- static char repr[100];
-
if (self->buf->buf == INVALID_BUFFER_VALUE)
! {
! vim_snprintf(repr, 100, "<range object (for deleted buffer) at %p>",
! (self));
! return PyString_FromString(repr);
! }
else
{
char *name = (char *)self->buf->buf->b_fname;
- int len;
if (name == NULL)
name = "";
- len = (int)strlen(name);
-
- if (len > 45)
- name = name + (45 - len);
-
- vim_snprintf(repr, 100, "<range %s%s (%d:%d)>",
- len > 45 ? "..." : "", name,
- self->start, self->end);
! return PyString_FromString(repr);
}
}
--- 3267,3284 ----
static PyObject *
RangeRepr(RangeObject *self)
{
if (self->buf->buf == INVALID_BUFFER_VALUE)
! return PyString_FromFormat("<range object (for deleted buffer) at %p>",
! (self));
else
{
char *name = (char *)self->buf->buf->b_fname;
if (name == NULL)
name = "";
! return PyString_FromFormat("<range %s (%d:%d)>",
! name, self->start, self->end);
}
}
***************
*** 3533,3560 ****
static PyObject *
BufferRepr(BufferObject *self)
{
- static char repr[100];
-
if (self->buf == INVALID_BUFFER_VALUE)
! {
! vim_snprintf(repr, 100, _("<buffer object (deleted) at %p>"), (self));
! return PyString_FromString(repr);
! }
else
{
! char *name = (char *)self->buf->b_fname;
! PyInt len;
if (name == NULL)
name = "";
- len = strlen(name);
-
- if (len > 35)
- name = name + (35 - len);
-
- vim_snprintf(repr, 100, "<buffer %s%s>", len > 35 ? "..." : "", name);
! return PyString_FromString(repr);
}
}
--- 3506,3521 ----
static PyObject *
BufferRepr(BufferObject *self)
{
if (self->buf == INVALID_BUFFER_VALUE)
! return PyString_FromFormat("<buffer object (deleted) at %p>", self);
else
{
! char *name = (char *)self->buf->b_fname;
if (name == NULL)
name = "";
! return PyString_FromFormat("<buffer %s>", name);
}
}
diff -cr vim.542435007988/src/if_python3.c vim.abd30ecabb33/src/if_python3.c
*** vim.542435007988/src/if_python3.c 2013-05-26 12:12:13.266144269 +0400
--- vim.abd30ecabb33/src/if_python3.c 2013-05-26 12:12:13.277144165 +0400
***************
*** 90,95 ****
--- 90,96 ----
#define PyString_AsString(obj) PyBytes_AsString(obj)
#define PyString_Size(obj) PyBytes_GET_SIZE(bytes)
#define PyString_FromString(repr) PyUnicode_FromString(repr)
+ #define PyString_FromFormat PyUnicode_FromFormat
#define PyString_AsStringAndSize(obj, buffer, len) PyBytes_AsStringAndSize(obj, buffer, len)
#define PyInt_Check(obj) PyLong_Check(obj)
#define PyInt_FromLong(i) PyLong_FromLong(i)
***************
*** 230,235 ****
--- 231,237 ----
# define PyType_GenericNew py3_PyType_GenericNew
# undef PyUnicode_FromString
# define PyUnicode_FromString py3_PyUnicode_FromString
+ # define PyUnicode_FromFormat py3_PyUnicode_FromFormat
# undef PyUnicode_Decode
# define PyUnicode_Decode py3_PyUnicode_Decode
# define PyType_IsSubtype py3_PyType_IsSubtype
***************
*** 293,298 ****
--- 295,301 ----
static int (*py3_PyType_Ready)(PyTypeObject *type);
static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item);
static PyObject* (*py3_PyUnicode_FromString)(const char *u);
+ static PyObject* (*py3_PyUnicode_FromFormat)(const char *u, ...);
static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size,
const char *encoding, const char *errors);
static long (*py3_PyLong_AsLong)(PyObject *);
***************
*** 458,463 ****
--- 461,467 ----
# else
{"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
# endif
+ {"PyUnicode_FromFormat", (PYTHON_PROC*)&py3_PyUnicode_FromFormat},
{"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
{"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize},
{"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
diff -cr vim.542435007988/src/if_python.c vim.abd30ecabb33/src/if_python.c
*** vim.542435007988/src/if_python.c 2013-05-26 12:12:13.274144193 +0400
--- vim.abd30ecabb33/src/if_python.c 2013-05-26 12:12:13.284144099 +0400
***************
*** 212,217 ****
--- 212,218 ----
# define PyString_AsString dll_PyString_AsString
# define PyString_AsStringAndSize dll_PyString_AsStringAndSize
# define PyString_FromString dll_PyString_FromString
+ # define PyString_FromFormat dll_PyString_FromFormat
# define PyString_FromStringAndSize dll_PyString_FromStringAndSize
# define PyString_Size dll_PyString_Size
# define PyString_Type (*dll_PyString_Type)
***************
*** 340,345 ****
--- 341,347 ----
static char*(*dll_PyString_AsString)(PyObject *);
static int(*dll_PyString_AsStringAndSize)(PyObject *, char **, int *);
static PyObject*(*dll_PyString_FromString)(const char *);
+ static PyObject*(*dll_PyString_FromFormat)(const char *, ...);
static PyObject*(*dll_PyString_FromStringAndSize)(const char *, PyInt);
static PyInt(*dll_PyString_Size)(PyObject *);
static PyTypeObject* dll_PyString_Type;
***************
*** 499,504 ****
--- 501,507 ----
{"PyString_AsString", (PYTHON_PROC*)&dll_PyString_AsString},
{"PyString_AsStringAndSize", (PYTHON_PROC*)&dll_PyString_AsStringAndSize},
{"PyString_FromString", (PYTHON_PROC*)&dll_PyString_FromString},
+ {"PyString_FromFormat", (PYTHON_PROC*)&dll_PyString_FromFormat},
{"PyString_FromStringAndSize", (PYTHON_PROC*)&dll_PyString_FromStringAndSize},
{"PyString_Size", (PYTHON_PROC*)&dll_PyString_Size},
{"PyString_Type", (PYTHON_PROC*)&dll_PyString_Type},
