[Python-checkins] r81075 - in python/branches/py3k: Modules/_cursesmodule.c
andrew.kuchling
python-checkins at python.org
Tue May 11 01:30:25 CEST 2010
Author: andrew.kuchling
Date: Tue May 11 01:30:25 2010
New Revision: 81075
Log:
Merged revisions 81073 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81073 | andrew.kuchling | 2010-05-10 19:27:01 -0400 (Mon, 10 May 2010) | 1 line
Use ';' after initialization macros to avoid confusing re-indenters
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Modules/_cursesmodule.c
Modified: python/branches/py3k/Modules/_cursesmodule.c
==============================================================================
--- python/branches/py3k/Modules/_cursesmodule.c (original)
+++ python/branches/py3k/Modules/_cursesmodule.c Tue May 11 01:30:25 2010
@@ -1748,8 +1748,8 @@
{
short color,r,g,b;
- PyCursesInitialised
- PyCursesInitialisedColor
+ PyCursesInitialised;
+ PyCursesInitialisedColor;
if (!PyArg_ParseTuple(args, "h:color_content", &color)) return NULL;
@@ -1767,8 +1767,8 @@
{
int n;
- PyCursesInitialised
- PyCursesInitialisedColor
+ PyCursesInitialised;
+ PyCursesInitialisedColor;
if (!PyArg_ParseTuple(args, "i:color_pair", &n)) return NULL;
return PyLong_FromLong((long) (n << 8));
@@ -1779,7 +1779,7 @@
{
int vis,erg;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args, "i:curs_set", &vis)) return NULL;
@@ -1794,7 +1794,7 @@
{
int ms;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args, "i:delay_output", &ms)) return NULL;
@@ -1806,7 +1806,7 @@
{
char ch;
- PyCursesInitialised
+ PyCursesInitialised;
ch = erasechar();
@@ -1819,7 +1819,7 @@
int x = 0;
int y = 0;
- PyCursesInitialised
+ PyCursesInitialised;
getsyx(y, x);
@@ -1833,7 +1833,7 @@
int rtn;
MEVENT event;
- PyCursesInitialised
+ PyCursesInitialised;
rtn = getmouse( &event );
if (rtn == ERR) {
@@ -1851,7 +1851,7 @@
{
MEVENT event;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args, "hiiil",
&event.id,
&event.x, &event.y, &event.z,
@@ -1872,7 +1872,7 @@
size_t datalen;
WINDOW *win;
- PyCursesInitialised
+ PyCursesInitialised;
strcpy(fn, "/tmp/py.curses.getwin.XXXXXX");
fd = mkstemp(fn);
@@ -1923,7 +1923,7 @@
{
unsigned char tenths;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args, "b:halfdelay", &tenths)) return NULL;
@@ -1936,7 +1936,7 @@
{
int ch;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"i",&ch)) return NULL;
@@ -1954,8 +1954,8 @@
{
short color, r, g, b;
- PyCursesInitialised
- PyCursesInitialisedColor
+ PyCursesInitialised;
+ PyCursesInitialisedColor;
switch(PyTuple_Size(args)) {
case 4:
@@ -1974,8 +1974,8 @@
{
short pair, f, b;
- PyCursesInitialised
- PyCursesInitialisedColor
+ PyCursesInitialised;
+ PyCursesInitialisedColor;
if (PyTuple_Size(args) != 3) {
PyErr_SetString(PyExc_TypeError, "init_pair requires 3 arguments");
@@ -2148,7 +2148,7 @@
{
int ch;
- PyCursesInitialised
+ PyCursesInitialised;
switch(PyTuple_Size(args)) {
case 1:
@@ -2170,7 +2170,7 @@
int columns;
int result;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"ii:is_term_resized", &lines, &columns))
return NULL;
@@ -2192,7 +2192,7 @@
const char *knp;
int ch;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"i",&ch)) return NULL;
@@ -2221,7 +2221,7 @@
{
int ch;
- PyCursesInitialised
+ PyCursesInitialised;
switch(PyTuple_Size(args)) {
case 1:
@@ -2240,7 +2240,7 @@
PyCurses_MouseInterval(PyObject *self, PyObject *args)
{
int interval;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"i;interval",&interval))
return NULL;
@@ -2253,7 +2253,7 @@
int newmask;
mmask_t oldmask, availmask;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"i;mousemask",&newmask))
return NULL;
availmask = mousemask(newmask, &oldmask);
@@ -2266,7 +2266,7 @@
{
int ms;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args, "i;ms", &ms)) return NULL;
return Py_BuildValue("i", napms(ms));
@@ -2279,7 +2279,7 @@
WINDOW *win;
int nlines, ncols;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"ii;nlines,ncols",&nlines,&ncols)) return NULL;
@@ -2299,7 +2299,7 @@
WINDOW *win;
int nlines, ncols, begin_y=0, begin_x=0;
- PyCursesInitialised
+ PyCursesInitialised;
switch (PyTuple_Size(args)) {
case 2:
@@ -2330,8 +2330,8 @@
{
short pair,f,b;
- PyCursesInitialised
- PyCursesInitialisedColor
+ PyCursesInitialised;
+ PyCursesInitialisedColor;
switch(PyTuple_Size(args)) {
case 1:
@@ -2356,8 +2356,8 @@
{
int n;
- PyCursesInitialised
- PyCursesInitialisedColor
+ PyCursesInitialised;
+ PyCursesInitialisedColor;
switch(PyTuple_Size(args)) {
case 1:
@@ -2386,7 +2386,7 @@
{
int flag = 0;
- PyCursesInitialised
+ PyCursesInitialised;
switch(PyTuple_Size(args)) {
case 0:
@@ -2462,7 +2462,7 @@
int columns;
PyObject *result;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"ii:resizeterm", &lines, &columns))
return NULL;
@@ -2486,7 +2486,7 @@
PyObject *result;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"ii:resize_term", &lines, &columns))
return NULL;
@@ -2505,7 +2505,7 @@
{
int y,x;
- PyCursesInitialised
+ PyCursesInitialised;
if (PyTuple_Size(args)!=2) {
PyErr_SetString(PyExc_TypeError, "setsyx requires 2 arguments");
@@ -2526,7 +2526,7 @@
int code;
PyObject *c, *cp;
- PyCursesInitialised
+ PyCursesInitialised;
code = start_color();
if (code != ERR) {
@@ -2618,7 +2618,7 @@
{
int fd;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"i;fd",&fd)) return NULL;
@@ -2631,7 +2631,7 @@
PyObject *temp;
chtype ch;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"O;ch or int",&temp)) return NULL;
@@ -2649,7 +2649,7 @@
PyObject *temp;
chtype ch;
- PyCursesInitialised
+ PyCursesInitialised;
if (!PyArg_ParseTuple(args,"O;ch or int",&temp)) return NULL;
@@ -2686,8 +2686,8 @@
{
int code;
- PyCursesInitialised
- PyCursesInitialisedColor
+ PyCursesInitialised;
+ PyCursesInitialisedColor;
code = use_default_colors();
if (code != ERR) {
More information about the Python-checkins
mailing list