Merge lp:~stgraber/ubuntu/quantal/newt/python3 into lp:ubuntu/quantal/newt

[Stéphane Graber]

[lp:~stgraber/ubuntu/quantal/newt/python3]

50. By Stéphane Graber on 2012-06-13

Fix Provides/Depends for python3 package

51. By Stéphane Graber on 2012-06-13

Fix typo s/built a text UI/build a text UI/g

52. By Stéphane Graber on 2012-06-13

No need to send .keys() through list() as it already returns something we can iterate

[Steve Langasek (vorlon)]

-for n in hotkeys.keys():
+for n in list(hotkeys.keys()):

Seems unnecessary in this case? I think this is the one Colin already reported on IRC.

- if (what.__dict__.has_key('g')):
+ if ('g' in what.__dict__):

non-idiomatic parentheses, should be dropped (as should the ones three lines above; probably not worth scrubbing all of them, but as long as we're already editing this line...)

- if (type(blist) == types.StringType):
+ if (isinstance(blist, str if sys.version >= '3' else basestring)):

there's also a 'types' import that's no longer needed as a result of this change and should be dropped. (reported by pyflakes)

- if (type(item) == types.TupleType):
+ if (type(item) == tuple):

not sure if it matters to use isinstance() here?

- if (type(e) in types.StringTypes):
+ if (type(e) in str):

doesn't this one break python2 compat? Seems like this needs the same kind of 'basestring' casing based on python version that's used elsewhere.

review: Needs Fixing

[lp:~stgraber/ubuntu/quantal/newt/python3]

53. By Stéphane Graber on 2012-06-13

.keys() is iterable, no need to get it through list()

54. By Stéphane Graber on 2012-06-13

Remove non-idiomatic parentheses

55. By Stéphane Graber on 2012-06-13

Rebuild diff, drop import of types in snack.py (no longer used) and use isinstance() instead of direct type comparison

56. By Stéphane Graber on 2012-06-13

Re-introduce list() call around hotkeys.keys() as it's actually required with python3

57. By Stéphane Graber on 2012-06-13

Do the same str or basestring trick for the other isinstance() call

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-09 16:19:14 +0000
+++ debian/changelog	2012-06-13 21:24:19 +0000
@@ -1,3 +1,20 @@
+newt (0.52.11-2ubuntu11) UNRELEASED; urgency=low
+
+  [ James Hunt ]
+  * Port python module to python3:
+    - Introduces python3-newt and python3-newt-dbg.
+    - Update build-depend to require python3-all-dev.
+
+  [ Stéphane Graber ]
+  * Port python module to python3:
+    - Make a debian/patches patch out of James' changes.
+    - Add missing python3-all-dbg build-dependency.
+    - Fix debian/rules generated symlinks to work with the python3
+      packages.
+    - Fix the Provides and Depends of the python3 packages.
+
+ -- Stéphane Graber <[e-mail]>  Wed, 13 Jun 2012 15:53:48 -0400
+
 newt (0.52.11-2ubuntu10) precise; urgency=low
 
   * Move libnewt to /lib and whiptail to /bin so they can be used by
 
=== modified file 'debian/control'
--- debian/control	2011-06-27 11:59:01 +0000
+++ debian/control	2012-06-13 21:24:19 +0000
@@ -6,7 +6,9 @@
 Standards-Version: 3.9.1
 Homepage: https://fedorahosted.org/newt/
 Vcs-Git: git://git.fedorahosted.org/git/newt
-Build-Depends: dbs, sgmltools-lite, libslang2-dev  (>=2.0.4-2), libpopt-dev, debhelper (>=5.0.37.2), gettext, libfribidi-dev, tcl8.5-dev, python-all-dev (>= 2.6.6-3~), autoconf, python-all-dbg
+Build-Depends: dbs, sgmltools-lite, libslang2-dev  (>=2.0.4-2), libpopt-dev, debhelper (>=5.0.37.2), gettext, libfribidi-dev, tcl8.5-dev, python-all-dev (>= 2.6.6-3~), python3-all-dev (>= 3.2.3), autoconf, python-all-dbg, python3-all-dbg
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: libnewt-dev
 Architecture: any
@@ -48,7 +50,7 @@
 Provides: ${python:Provides}
 Depends: libnewt0.52 (=${binary:Version}) , ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: A NEWT module for Python
- This module allows you to built a text UI for your Python scripts
+ This module allows you to build a text UI for your Python scripts
  using newt.
 
 Package: python-newt-dbg
@@ -57,11 +59,31 @@
 Priority: extra
 Depends: libnewt0.52 (=${binary:Version}), python-newt (=${binary:Version}), python-dbg, ${misc:Depends}, ${shlibs:Depends}
 Description: A NEWT module for Python (debug extension)
- This module allows you to built a text UI for your Python scripts
- using newt.
- .
- This package contains the extension built for the Python debug interpreter.
-
+ This module allows you to build a text UI for your Python scripts
+ using newt.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-newt
+Architecture: any
+Section: python
+Priority: optional
+Provides: ${python3:Provides}
+Depends: libnewt0.52 (=${binary:Version}) , ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Description: A NEWT module for Python 3
+ This module allows you to build a text UI for your Python 3 scripts
+ using newt.
+
+Package: python3-newt-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libnewt0.52 (=${binary:Version}), python3-newt (=${binary:Version}), python3-dbg, ${misc:Depends}, ${shlibs:Depends}
+Description: A NEWT module for Python 3 (debug extension)
+ This module allows you to build a text UI for your Python 3 scripts
+ using newt.
+ .
+ This package contains the extension built for the Python debug interpreter.
 
 Package: libnewt0.52
 Architecture: any
 
=== added file 'debian/patches/002_python3.patch'
--- debian/patches/002_python3.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/002_python3.patch	2012-06-13 21:24:19 +0000
@@ -0,0 +1,529 @@
+diff -Nrup newt-0.52.11.orig/Makefile.in newt-0.52.11/Makefile.in
+--- newt-0.52.11.orig/Makefile.in	2012-06-13 15:27:07.475835745 -0400
++++ newt-0.52.11/Makefile.in	2012-06-13 16:48:33.031972016 -0400
+@@ -12,6 +12,7 @@ TAG = r$(subst .,-,$(VERSION))
+ SONAME = @SONAME@
+ 
+ PYTHONVERS =  $(shell pyversions --supported)
++PYTHON3VERS =  $(shell py3versions --supported)
+ WHIPTCLSO = @WHIPTCLSO@
+ 
+ PROGS = test whiptail $(WHIPTCLSO) testgrid testtree showchars showkey
+@@ -68,7 +69,7 @@ showkey:	showkey.o $(LIBNEWT)
+ 	$(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
+ 
+ _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
+-	for ver in $(PYTHONVERS) ; do \
++	for ver in $(PYTHONVERS) $(PYTHON3VERS); do \
+ 	    	mkdir -p $$ver ;\
+ 	        $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\
+ 		$(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L .  -lnewt ;\
+@@ -129,7 +130,7 @@ install-sh: sharedlib $(WHIPTCLSO) _snac
+ 	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
+ 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
+ 	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
+-	for ver in $(PYTHONVERS) ; do \
++	for ver in $(PYTHONVERS) $(PYTHON3VERS); do \
+ 	   [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
+ 	   install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
+ +	   install -m 755 $$ver/_snackmodule_d.so $(instroot)/$(libdir)/$$ver/site-packages ;\
+diff -Nrup newt-0.52.11.orig/peanuts.py newt-0.52.11/peanuts.py
+--- newt-0.52.11.orig/peanuts.py	2009-09-24 11:03:09.000000000 -0400
++++ newt-0.52.11/peanuts.py	2012-06-13 16:48:33.031972016 -0400
+@@ -2,6 +2,7 @@
+ 
+ # Demo program to show use of python-newt module
+ 
++from __future__ import absolute_import, print_function, unicode_literals
+ from snack import *
+ 
+ screen = SnackScreen()
+@@ -38,8 +39,8 @@ result = g.runOnce()
+ 
+ screen.finish()
+ 
+-print result
+-print "listbox:", li.current()
+-print "rb:", rb.getSelection()
+-print "bb:", bb.buttonPressed(result)
+-print "checkboxtree:", ct.getSelection()
++print(result)
++print("listbox:", li.current())
++print("rb:", rb.getSelection())
++print("bb:", bb.buttonPressed(result))
++print("checkboxtree:", ct.getSelection())
+diff -Nrup newt-0.52.11.orig/popcorn.py newt-0.52.11/popcorn.py
+--- newt-0.52.11.orig/popcorn.py	2009-09-24 11:03:09.000000000 -0400
++++ newt-0.52.11/popcorn.py	2012-06-13 16:48:33.031972016 -0400
+@@ -1,5 +1,6 @@
+ #!/usr/bin/python
+ 
++from __future__ import absolute_import, print_function, unicode_literals
+ from snack import *
+ import sys
+ 
+@@ -45,7 +46,7 @@ r1 = SingleRadioButton("Radio 1", None,
+ r2 = SingleRadioButton("Radio 2", r1)
+ 
+ def something():
+-    print hello
++    print(hello)
+ 
+ screen = SnackScreen()
+ 
+@@ -99,14 +100,14 @@ g.runOnce()
+ 
+ screen.finish()
+ 
+-print "val", e.value()
+-print "check", cb.value()
+-print "r1", r1.selected()
+-print "listbox", li.current()
++print("val", e.value())
++print("check", cb.value())
++print("r1", r1.selected())
++print("listbox", li.current())
+ # returns a tuple of the wrapped text, the actual width, and the actual height
+-print res
++print(res)
+ 
+-print foo
+-print 'lbcw', lbcw
+-print "ct selected", ct.getSelection()
+-print "ct current", ct.getCurrent()
++print(foo)
++print('lbcw', lbcw)
++print("ct selected", ct.getSelection())
++print("ct current", ct.getCurrent())
+diff -Nrup newt-0.52.11.orig/snackmodule.c newt-0.52.11/snackmodule.c
+--- newt-0.52.11.orig/snackmodule.c	2012-06-13 15:27:07.479835744 -0400
++++ newt-0.52.11/snackmodule.c	2012-06-13 16:48:33.031972016 -0400
+@@ -12,10 +12,24 @@
+ #include <unistd.h>
+ 
+ #include "Python.h"
++#include "structmember.h"
+ #include "nls.h"
+ #include "newt.h"
+ #include "newt_pr.h"
+ 
++#if PY_MAJOR_VERSION >= 3
++  #define PyInt_FromLong PyLong_FromLong
++  #define PyInt_AsLong PyLong_AsLong
++  #define PyString_FromString PyUnicode_FromString
++  #define MOD_ERROR_VAL NULL
++  #define MOD_SUCCESS_VAL(val) val
++  #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
++#else
++  #define MOD_ERROR_VAL
++  #define MOD_SUCCESS_VAL(val)
++  #define MOD_INIT(name) void init##name(void)
++#endif
++
+ typedef struct snackWidget_s snackWidget;
+ typedef struct snackGrid_s snackGrid;
+ typedef struct snackForm_s snackForm;
+@@ -68,6 +82,8 @@ static snackWidget * textWidget(PyObject
+ static PyObject * ternaryWindow(PyObject * s, PyObject * args);
+ static snackWidget * checkboxTreeWidget(PyObject * s, PyObject * args, PyObject * kwargs);
+ static PyObject * pywstrlen(PyObject * s, PyObject * args);
++static PyObject * widget_get_checkboxValue(PyObject *self, void *closure);
++static PyObject * widget_get_radioValue(PyObject *self, void *closure);
+ 
+ static PyMethodDef snackModuleMethods[] = {
+     { "button", (PyCFunction) buttonWidget, METH_VARARGS, NULL },
+@@ -107,12 +123,31 @@ static PyMethodDef snackModuleMethods[]
+     { NULL }
+ } ;
+ 
++#if PY_MAJOR_VERSION >= 3
++static struct PyModuleDef moduledef = {
++    PyModuleDef_HEAD_INIT,
++        "_snack",            /* m_name */
++        NULL,                /* m_doc */
++        -1,                  /* m_size */
++        snackModuleMethods,  /* m_methods */
++        NULL,                /* m_reload */
++        NULL,                /* m_traverse */
++        NULL,                /* m_clear */
++        NULL,                /* m_free */
++    };
++#endif
++
++static struct PyGetSetDef widget_getset[] = {
++        { "checkboxValue", widget_get_checkboxValue, 0, NULL, NULL },
++        { "radioValue", widget_get_radioValue, 0, NULL, NULL },
++        { NULL }
++};
++
+ struct snackGrid_s {
+     PyObject_HEAD
+     newtGrid grid;
+ } ;
+ 
+-static PyObject * gridGetAttr(PyObject * s, char * name);
+ static PyObject * gridPlace(snackGrid * s, PyObject * args);
+ static PyObject * gridSetField(snackGrid * s, PyObject * args);
+ 
+@@ -123,20 +158,34 @@ static PyMethodDef gridMethods[] = {
+ };
+ 
+ static PyTypeObject snackGridType = {
+-        PyObject_HEAD_INIT(&PyType_Type)
+-        0,                              /* ob_size */
++        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+         "snackgrid",                    /* tp_name */
+         sizeof(snackGrid),              /* tp_size */
+         0,                              /* tp_itemsize */
+         emptyDestructor,      			/* tp_dealloc */
+         0,                              /* tp_print */
+-        gridGetAttr,    		/* tp_getattr */
++        0,                   		/* tp_getattr */
+         0,                              /* tp_setattr */
+         0,                              /* tp_compare */
+         0,                              /* tp_repr */
+         0,                              /* tp_as_number */
+         0,                              /* tp_as_sequence */
+         0,                		/* tp_as_mapping */
++	0,                              /* tp_hash */
++	0,                              /* tp_call */
++	0,                              /* tp_str */
++	PyObject_GenericGetAttr,        /* tp_getattro */
++	0,                              /* tp_setattro */
++	0,                              /* tp_as_buffer */
++	Py_TPFLAGS_DEFAULT,             /* tp_flags */
++	0,                              /* tp_doc */
++	0,                              /* tp_traverse */
++	0,                              /* tp_clear */
++	0,                              /* tp_richcompare */
++	0,                              /* tp_weaklistoffset */
++	0,                              /* tp_iter */
++	0,                              /* tp_iternext */
++	gridMethods                     /* tp_methods */
+ };
+ 
+ struct snackForm_s {
+@@ -144,7 +193,6 @@ struct snackForm_s {
+     newtComponent fo;
+ } ;
+ 
+-static PyObject * formGetAttr(PyObject * s, char * name);
+ static PyObject * formAdd(snackForm * s, PyObject * args);
+ static PyObject * formDraw(snackForm * s, PyObject * args);
+ static PyObject * formRun(snackForm * s, PyObject * args);
+@@ -165,20 +213,34 @@ static PyMethodDef formMethods[] = {
+ };
+ 
+ static PyTypeObject snackFormType = {
+-        PyObject_HEAD_INIT(&PyType_Type)
+-        0,                              /* ob_size */
++        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+         "snackform",                    /* tp_name */
+         sizeof(snackForm),              /* tp_size */
+         0,                              /* tp_itemsize */
+         emptyDestructor,      		/* tp_dealloc */
+         0,                              /* tp_print */
+-        formGetAttr,    		/* tp_getattr */
++        0,                     		/* tp_getattr */
+         0,                              /* tp_setattr */
+         0,                              /* tp_compare */
+         0,                              /* tp_repr */
+         0,                              /* tp_as_number */
+         0,                              /* tp_as_sequence */
+         0,                		/* tp_as_mapping */
++	0,                              /* tp_hash */
++	0,                              /* tp_call */
++	0,                              /* tp_str */
++	PyObject_GenericGetAttr,        /* tp_getattro */
++	0,                              /* tp_setattro */
++	0,                              /* tp_as_buffer */
++	Py_TPFLAGS_DEFAULT,             /* tp_flags */
++	0,                              /* tp_doc */
++	0,                              /* tp_traverse */
++	0,                              /* tp_clear */
++	0,                              /* tp_richcompare */
++	0,                              /* tp_weaklistoffset */
++	0,                              /* tp_iter */
++	0,                              /* tp_iternext */
++	formMethods                     /* tp_methods */
+ };
+ 
+ struct snackWidget_s {
+@@ -191,7 +253,6 @@ struct snackWidget_s {
+ } ;
+ 
+ static PyObject * widgetAddCallback(snackWidget * s, PyObject * args);
+-static PyObject * widgetGetAttr(PyObject * s, char * name);
+ static void widgetDestructor(PyObject * s);
+ static PyObject * widgetEntrySetValue(snackWidget * s, PyObject * args);
+ static PyObject * widgetLabelText(snackWidget * s, PyObject * args);
+@@ -253,21 +314,43 @@ static PyMethodDef widgetMethods[] = {
+     { NULL }
+ };
+ 
++static PyMemberDef widget_members[] = {
++        { "key" , T_INT, offsetof(snackWidget, co), 0, NULL },
++        { "entryValue", T_STRING, offsetof(snackWidget, apointer), 0, NULL },
++	{ NULL }
++};
++
+ static PyTypeObject snackWidgetType = {
+-        PyObject_HEAD_INIT(&PyType_Type)
+-        0,                              /* ob_size */
++        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+         "snackwidget",                  /* tp_name */
+         sizeof(snackWidget),            /* tp_size */
+         0,                              /* tp_itemsize */
+         widgetDestructor,      		/* tp_dealloc */
+         0,                              /* tp_print */
+-        widgetGetAttr,  		/* tp_getattr */
++        0,                   		/* tp_getattr */
+         0,                              /* tp_setattr */
+         0,                              /* tp_compare */
+         0,                              /* tp_repr */
+         0,                              /* tp_as_number */
+         0,                              /* tp_as_sequence */
+         0,                		/* tp_as_mapping */
++	0,                              /* tp_hash */
++	0,                              /* tp_call */
++	0,                              /* tp_str */
++	PyObject_GenericGetAttr,        /* tp_getattro */
++	0,                              /* tp_setattro */
++	0,                              /* tp_as_buffer */
++	Py_TPFLAGS_DEFAULT,             /* tp_flags */
++	0,                              /* tp_doc */
++	0,                              /* tp_traverse */
++	0,                              /* tp_clear */
++	0,                              /* tp_richcompare */
++	0,                              /* tp_weaklistoffset */
++	0,                              /* tp_iter */
++	0,                              /* tp_iternext */
++	widgetMethods,                  /* tp_methods */
++	widget_members,                 /* tp_members */
++	widget_getset                   /* tp_getset */
+ };
+ 
+ static snackWidget * snackWidgetNew (void) {
+@@ -808,10 +891,6 @@ static snackGrid * gridCreate(PyObject *
+     return grid;
+ }
+ 
+-static PyObject * gridGetAttr(PyObject * s, char * name) {
+-    return Py_FindMethod(gridMethods, s, name);
+-}
+-
+ static PyObject * gridPlace(snackGrid * grid, PyObject * args) {
+     int x, y;
+ 
+@@ -835,7 +914,7 @@ static PyObject * gridSetField(snackGrid
+ 				&anchorFlags, &growFlags)) 
+ 	return NULL;
+ 
+-    if (w->ob_type == &snackWidgetType) {
++    if (Py_TYPE(w) == &snackWidgetType) {
+ 	newtGridSetField(grid->grid, x, y, NEWT_GRID_COMPONENT,
+ 			 w->co, pLeft, pTop, pRight, pBottom, anchorFlags, 
+ 			 growFlags);
+@@ -850,10 +929,6 @@ static PyObject * gridSetField(snackGrid
+     return Py_None;
+ }
+ 
+-static PyObject * formGetAttr(PyObject * s, char * name) {
+-    return Py_FindMethod(formMethods, s, name);
+-}
+-
+ static PyObject * formDraw(snackForm * s, PyObject * args) {
+     newtDrawForm(s->fo);
+ 
+@@ -943,20 +1018,18 @@ static PyObject * formSetCurrent(snackFo
+     return Py_None;
+ }
+ 
+-static PyObject * widgetGetAttr(PyObject * s, char * name) {
+-    snackWidget * w = (snackWidget *) s;
++static PyObject * widget_get_checkboxValue(PyObject *self, void *closure)
++{
++	snackWidget *w = (snackWidget *)self;
+ 
+-    if (!strcmp(name, "key")) {
+-	return Py_BuildValue("i", w->co);
+-    } else if (!strcmp(name, "entryValue")) {
+-	return Py_BuildValue("s", w->apointer);
+-    } else if (!strcmp(name, "checkboxValue")) {
+ 	return Py_BuildValue("i", w->achar == ' ' ? 0 : 1);
+-    } else if (!strcmp(name, "radioValue")) {
+-	return Py_BuildValue("i", newtRadioGetCurrent(w->co));
+-    }
++}
++
++static PyObject * widget_get_radioValue(PyObject *self, void *closure)
++{
++	snackWidget *w = (snackWidget *)self;
+ 
+-    return Py_FindMethod(widgetMethods, s, name);
++	return Py_BuildValue("i", newtRadioGetCurrent(w->co));
+ }
+ 
+ static void widgetDestructor(PyObject * o) {
+@@ -1284,7 +1357,8 @@ static PyObject * pywstrlen(PyObject * s
+     return PyInt_FromLong(wstrlen(str, len));
+ }
+ 
+-void init_snack(void) {
++MOD_INIT(_snack)
++{
+     PyObject * d, * m;
+ 
+ #ifdef ENABLE_NLS
+@@ -1293,7 +1367,15 @@ void init_snack(void) {
+     textdomain (PACKAGE);
+ #endif
+ 
++#if PY_MAJOR_VERSION >= 3
++    m = PyModule_Create(&moduledef);
++#else
+     m = Py_InitModule("_snack", snackModuleMethods);
++#endif
++
++    if (! m)
++	    return MOD_ERROR_VAL;
++
+     d = PyModule_GetDict(m);
+ 
+     PyDict_SetItemString(d, "ANCHOR_LEFT", PyInt_FromLong(NEWT_ANCHOR_LEFT));
+@@ -1355,4 +1437,6 @@ void init_snack(void) {
+     PyDict_SetItemString(d, "COLORSET_COMPACTBUTTON", PyInt_FromLong(NEWT_COLORSET_COMPACTBUTTON));
+     PyDict_SetItemString(d, "COLORSET_ACTSELLISTBOX", PyInt_FromLong(NEWT_COLORSET_ACTSELLISTBOX));
+     PyDict_SetItemString(d, "COLORSET_SELLISTBOX", PyInt_FromLong(NEWT_COLORSET_SELLISTBOX));
++
++    return MOD_SUCCESS_VAL(m);
+ }
+diff -Nrup newt-0.52.11.orig/snack.py newt-0.52.11/snack.py
+--- newt-0.52.11.orig/snack.py	2009-09-24 11:03:09.000000000 -0400
++++ newt-0.52.11/snack.py	2012-06-13 17:05:17.416000032 -0400
+@@ -39,9 +39,10 @@ Functions:
+  - EntryWindow
+ """
+ 
++
++from __future__ import absolute_import, print_function, unicode_literals
+ import _snack
+-import types
+-import string
++import sys
+ 
+ from _snack import FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE, FD_READ, FD_WRITE, FD_EXCEPT
+ 
+@@ -296,7 +297,7 @@ hotkeys = { "F1" : _snack.KEY_F1, "F2" :
+             "F10" : _snack.KEY_F10, "F11" : _snack.KEY_F11, 
+             "F12" : _snack.KEY_F12, "ESC" : _snack.KEY_ESC ,  " " : ord(" ") }
+ 
+-for n in hotkeys.keys():
++for n in list(hotkeys.keys()):
+     hotkeys[hotkeys[n]] = n
+ 
+ class Form:
+@@ -317,14 +318,14 @@ class Form:
+         self.w.addhotkey(hotkeys[keyname])
+ 
+     def add(self, widget):
+-        if widget.__dict__.has_key('hotkeys'):
++        if 'hotkeys' in widget.__dict__:
+             for key in widget.hotkeys.keys():
+                 self.addHotKey(key)
+ 
+-        if widget.__dict__.has_key('gridmembers'):
++        if 'gridmembers' in widget.__dict__:
+             for w in widget.gridmembers:
+                 self.add(w)
+-        elif widget.__dict__.has_key('w'):
++        elif 'w' in widget.__dict__:
+             self.trans[widget.w.key] = widget
+             return self.w.add(widget.w)
+         return None
+@@ -397,14 +398,14 @@ class Grid:
+         if (growy):
+             gridFlags = gridFlags | _snack.GRID_GROWY
+ 
+-        if (what.__dict__.has_key('g')):
++        if 'g' in what.__dict__:
+             return self.g.setfield(col, row, what.g, padding, anchorFlags,
+                        gridFlags)
+         else:
+             return self.g.setfield(col, row, what.w, padding, anchorFlags)
+     
+     def __init__(self, *args):
+-        self.g = apply(_snack.grid, args)
++        self.g = _snack.grid(*args)
+         self.gridmembers = []
+ 
+ colorsets = { "ROOT" : _snack.COLORSET_ROOT,
+@@ -470,7 +471,7 @@ class SnackScreen:
+     
+     def helpCallback(self, cb):
+     	self.helpCb = cb
+-        return _snack.helpcallback(self.doHelpCallback)
++    	return _snack.helpcallback(self.doHelpCallback)
+ 
+     def suspendCallback(self, cb, data = None):
+         if data:
+@@ -589,9 +590,9 @@ class ButtonBar(Grid):
+         self.item = 0
+         Grid.__init__(self, len(buttonlist), 1)
+         for blist in buttonlist:
+-            if (type(blist) == types.StringType):
++            if isinstance(blist, str if sys.version >= '3' else basestring):
+                 title = blist
+-                value = string.lower(blist)
++                value = blist.lower()
+             elif len(blist) == 2:
+                 (title, value) = blist
+             else:
+@@ -607,7 +608,7 @@ class ButtonBar(Grid):
+             self.item = self.item + 1
+ 
+     def buttonPressed(self, result):    
+-        if self.hotkeys.has_key(result):
++        if result in self.hotkeys:
+             return self.hotkeys[result]
+ 
+         for (button, value) in self.list:
+@@ -642,7 +643,7 @@ class GridFormHelp(Grid):
+         self.form_created = 0
+         args = list(args)
+         args[:0] = [self]
+-        apply(Grid.__init__, tuple(args))
++        Grid.__init__(*tuple(args))
+ 
+     def add(self, widget, col, row, padding = (0, 0, 0, 0),
+             anchorLeft = 0, anchorTop = 0, anchorRight = 0,
+@@ -698,7 +699,7 @@ class GridForm(GridFormHelp):
+     """
+     def __init__(self, screen, title, *args):
+         myargs = (self, screen, title, None) + args
+-        apply(GridFormHelp.__init__, myargs)
++        GridFormHelp.__init__(*myargs)
+ 
+ class CheckboxTree(Widget):
+     """ CheckboxTree combo widget,
+@@ -773,7 +774,7 @@ def ListboxChoiceWindow(screen, title, t
+     l = Listbox(height, scroll = scroll, returnExit = 1)
+     count = 0
+     for item in items:
+-        if (type(item) == types.TupleType):
++        if type(item) == tuple:
+             (text, key) = item
+         else:
+             text = item
+@@ -833,9 +834,9 @@ def EntryWindow(screen, title, text, pro
+     count = 0
+     entryList = []
+     for n in prompts:
+-        if (type(n) == types.TupleType):
++        if type(n) == tuple:
+             (n, e) = n
+-            if (type(e) in types.StringTypes):
++            if isinstance(e, str if sys.version >= '3' else basestring):
+                 e = Entry(entryWidth, e)
+         else:
+             e = Entry(entryWidth)
 
=== modified file 'debian/rules'
--- debian/rules	2012-02-09 16:13:25 +0000
+++ debian/rules	2012-06-13 21:24:19 +0000
@@ -9,7 +9,6 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_HOST_GNU_TYPE), $(DEB_BUILD_GNU_TYPE))
@@ -23,6 +22,10 @@
 VERSION=0.52.11
 SONAME=0.52
 PYVERS=$(shell pyversions -vr debian/control)
+PY3VERS=$(shell py3versions -vr debian/control)
+
+PYTHON2=$(shell pyversions -r debian/control)
+PYTHON3=$(shell py3versions -r debian/control)
 
 LIB_PKG=libnewt$(SONAME)
 DEV_PKG=libnewt-dev
@@ -30,7 +33,10 @@
 TCL_PKG=newt-tcl
 PYTHON_PKG=python-newt
 PYTHON_DBG_PKG=python-newt-dbg
+PYTHON3_PKG=python3-newt
+PYTHON3_DBG_PKG=python3-newt-dbg
 WHIPTAIL_PKG=whiptail
+EXAMPLES=peanuts.py popcorn.py
 
 # the dbs rules
 TAR_DIR=newt-$(VERSION)
@@ -102,14 +108,15 @@
 	dh_testroot
 	dh_clean 
 	rm -rf $(SOURCE_DIR) $(STAMP_DIR)
-	rm -f debian/python-newt*.dirs debian/python-newt*.install debian/python-newt.postinst
+	rm -f debian/python-newt*.dirs debian/python*-newt*.install debian/python-newt.postinst
+	rm -f debian/python*-newt*.examples 
 	# rm -rf   debian/substvars debian/*.bak debian/*~ *~ 
 
 binary: binary-indep binary-arch
 
 binary-indep:
 
-binary-arch: $(LIB_PKG) $(DEV_PKG) $(PIC_PKG) $(TCL_PKG) $(PYTHON_PKG) $(PYTHON_DBG_PKG) $(WHIPTAIL_PKG)
+binary-arch: $(LIB_PKG) $(DEV_PKG) $(PIC_PKG) $(TCL_PKG) $(PYTHON_PKG) $(PYTHON_DBG_PKG) $(PYTHON3_PKG) $(PYTHON3_DBG_PKG) $(WHIPTAIL_PKG)
 
 $(LIB_PKG): build
 	dh_testdir
@@ -210,17 +217,22 @@
 	done
 	dh_installdirs -p $@ 
 	dh_install -p $@ --sourcedir=$(BUILD_TREE)
-	dh_strip -p $@ --dbg-package python-newt-dbg
-	dh_python2 -p $@
+	dh_strip -p $@ --dbg-package $(PYTHON_DBG_PKG)
 	dh_installdocs -p $@ $(BUILD_TREE)/newt.spec
 	# Currently disabled, as debian-test has been removed.
 	# chmod +x debian/whiptail/usr/lib/debian-test/tests/whiptail/test-newt.sh/test-newt.sh
 	dh_installchangelogs -p $@ 
+	for example in $(EXAMPLES); do \
+		echo "build-tree/*/$$example" >> debian/$@.examples; \
+	done
 	dh_installexamples -p $@
+	sed -i "1s/^\(#! *[^ ]*\)python$\/\1$(PYTHON2)/" debian/$(@)/usr/share/doc/$(@)/examples/*.py
 	dh_compress -p $@
 	dh_shlibdeps -p $@ -ldebian/$@/usr/lib
 	dh_fixperms -p $@
 	dh_installdeb  -p $@
+	# Call after all other files have been created and installed
+	dh_python2 -p $@
 	dh_gencontrol -p $@ 
 	dh_md5sums -p $@
 	dh_builddeb -p $@
@@ -236,13 +248,70 @@
 	done
 	dh_installdirs -p $@ 
 	dh_install -p $@ --sourcedir=$(BUILD_TREE)
+	mkdir -p debian/$(@)/usr/share/doc
+	ln -sf $(PYTHON_PKG) debian/$(@)/usr/share/doc/$(@)
+	dh_compress -p $@
+	dh_shlibdeps -p $@ -ldebian/$@/usr/lib
+	dh_fixperms -p $@
+	dh_installdeb -p $@
+	# Call after all other files have been created and installed
 	dh_python2 -p $@
-	mkdir -p debian/python-newt-dbg/usr/share/doc
-	ln -sf python-newt debian/python-newt-dbg/usr/share/doc/python-newt-dbg
+	dh_gencontrol -p $@ 
+	dh_md5sums -p $@
+	dh_builddeb -p $@
+
+$(PYTHON3_PKG): build
+	dh_testdir
+	dh_testroot 
+	for v in $(PY3VERS); do \
+		pylib=$$(python$$v -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'); \
+		echo $$pylib >> debian/$@.dirs; \
+		echo python$$v/_snackmodule.so $$pylib/ \
+		>> debian/$@.install; \
+		echo snack.py $$pylib \
+		>> debian/$@.install; \
+	done
+	dh_installdirs -p $@ 
+	dh_install -p $@ --sourcedir=$(BUILD_TREE)
+	dh_strip -p $@ --dbg-package $(PYTHON3_DBG_PKG)
+	dh_installdocs -p $@ $(BUILD_TREE)/newt.spec
+	# Currently disabled, as debian-test has been removed.
+	# chmod +x debian/whiptail/usr/lib/debian-test/tests/whiptail/test-newt.sh/test-newt.sh
+	dh_installchangelogs -p $@ 
+	for example in $(EXAMPLES); do \
+		echo "build-tree/*/$$example" >> debian/$@.examples; \
+	done
+	dh_installexamples -p $@
+	sed -i "1s/^\(#! *[^ ]*\)python$\/\1$(PYTHON3)/" debian/$(@)/usr/share/doc/$(@)/examples/*.py
+	dh_compress -p $@
+	dh_shlibdeps -p $@ -ldebian/$@/usr/lib
+	dh_fixperms -p $@
+	dh_installdeb  -p $@
+	# Call after all other files have been created and installed
+	dh_python3 -p $@
+	dh_gencontrol -p $@ 
+	dh_md5sums -p $@
+	dh_builddeb -p $@
+
+$(PYTHON3_DBG_PKG): build $(PYTHON3_PKG)
+	dh_testdir
+	dh_testroot 
+	for v in $(PY3VERS); do \
+		pylib=$$(python$$v -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(1))'); \
+		echo $$pylib >> debian/$@.dirs; \
+		echo python$$v/_snackmodule_d.so $$pylib/ \
+		>> debian/$@.install; \
+	done
+	dh_installdirs -p $@ 
+	dh_install -p $@ --sourcedir=$(BUILD_TREE)
+	mkdir -p debian/$(@)/usr/share/doc
+	ln -sf $(PYTHON3_PKG) debian/$(@)/usr/share/doc/$(@)
 	dh_compress -p $@
 	dh_shlibdeps -p $@ -ldebian/$@/usr/lib
 	dh_fixperms -p $@
 	dh_installdeb -p $@
+	# Call after all other files have been created and installed
+	dh_python3 -p $@
 	dh_gencontrol -p $@ 
 	dh_md5sums -p $@
 	dh_builddeb -p $@