[Pkg-corba-commits] r145 - in /branches/upstream/python-omniorb/current: ./ contrib/RPMs/ mk/ modules/ omniidl_be/ python/omniORB/
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Wed Mar 26 21:55:50 UTC 2008
Author: flub-guest
Date: Wed Mar 26 21:55:50 2008
New Revision: 145
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=145
Log:
[svn-upgrade] Integrating new upstream version, python-omniorb (3.2)
Added:
branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_2
branches/upstream/python-omniorb/current/bugfixes-31.xml
Removed:
branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_0
Modified:
branches/upstream/python-omniorb/current/README.txt
branches/upstream/python-omniorb/current/ReleaseNotes.txt
branches/upstream/python-omniorb/current/configure
branches/upstream/python-omniorb/current/configure.ac
branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec
branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy_new.spec
branches/upstream/python-omniorb/current/mk/version.mk
branches/upstream/python-omniorb/current/modules/pyServant.cc
branches/upstream/python-omniorb/current/omniidl_be/python.py
branches/upstream/python-omniorb/current/python/omniORB/__init__.py
branches/upstream/python-omniorb/current/update.log
Modified: branches/upstream/python-omniorb/current/README.txt
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/README.txt?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/README.txt (original)
+++ branches/upstream/python-omniorb/current/README.txt Wed Mar 26 21:55:50 2008
@@ -1,7 +1,7 @@
omniORBpy 3
===========
-This is omniORBpy 3.1.
+This is omniORBpy 3.2.
omniORBpy is a robust high-performance CORBA ORB for Python.
Modified: branches/upstream/python-omniorb/current/ReleaseNotes.txt
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/ReleaseNotes.txt?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/ReleaseNotes.txt (original)
+++ branches/upstream/python-omniorb/current/ReleaseNotes.txt Wed Mar 26 21:55:50 2008
@@ -1,10 +1,16 @@
RELEASE NOTES
=============
-This is omniORBpy 3.1.
+This is omniORBpy 3.2.
See README.txt for building instructions.
See the documentation in the doc directory for more information.
+
+
+Changes since omniORBpy 3.1
+---------------------------
+
+ - Bug fixes. See bugfixes-31.xml.
Changes since omniORBpy 3.0
Added: branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_2
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_2?rev=145&op=file
==============================================================================
--- branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_2 (added)
+++ branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_2 Wed Mar 26 21:55:50 2008
@@ -1,0 +1,1 @@
+
Added: branches/upstream/python-omniorb/current/bugfixes-31.xml
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/bugfixes-31.xml?rev=145&op=file
==============================================================================
--- branches/upstream/python-omniorb/current/bugfixes-31.xml (added)
+++ branches/upstream/python-omniorb/current/bugfixes-31.xml Wed Mar 26 21:55:50 2008
@@ -1,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
+<?xml-stylesheet type="text/xml" href="buglayout.xml"?>
+
+<!-- The following bugs have been fixed since the omniORBpy 3.0 -->
+<!-- release. This file is transformed into html with bugfixes.xsl. -->
+
+<!-- Editors: make sure the content you add is well-formed XML. -->
+
+<buglist version="3.1">
+
+<bug id="1" date="Fri Feb 1 16:22:20 GMT 2008" user="dgrisby">
+ <summary>Cannot implement operations with names clashing with Python keywords</summary>
+ <reported>Jimmy Deveil</reported>
+ <text>
+ Operations with names clashing with Python keywords were not handled
+ properly, meaning it was impossible to implement a server with such
+ operations.
+ </text>
+</bug>
+
+</buglist>
Modified: branches/upstream/python-omniorb/current/configure
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/configure?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/configure (original)
+++ branches/upstream/python-omniorb/current/configure Wed Mar 26 21:55:50 2008
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for omniORBpy 3.1.
+# Generated by GNU Autoconf 2.59 for omniORBpy 3.2.
#
# Report bugs to <bugs at omniorb-support.com>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='omniORBpy'
PACKAGE_TARNAME='omniorbpy'
-PACKAGE_VERSION='3.1'
-PACKAGE_STRING='omniORBpy 3.1'
+PACKAGE_VERSION='3.2'
+PACKAGE_STRING='omniORBpy 3.2'
PACKAGE_BUGREPORT='bugs at omniorb-support.com'
ac_unique_file="python/omniORB/CORBA.py"
@@ -751,7 +751,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures omniORBpy 3.1 to adapt to many kinds of systems.
+\`configure' configures omniORBpy 3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -812,7 +812,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of omniORBpy 3.1:";;
+ short | recursive ) echo "Configuration of omniORBpy 3.2:";;
esac
cat <<\_ACEOF
@@ -932,7 +932,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-omniORBpy configure 3.1
+omniORBpy configure 3.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -946,7 +946,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by omniORBpy $as_me 3.1, which was
+It was created by omniORBpy $as_me 3.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -4065,7 +4065,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by omniORBpy $as_me 3.1, which was
+This file was extended by omniORBpy $as_me 3.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4120,7 +4120,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-omniORBpy config.status 3.1
+omniORBpy config.status 3.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/upstream/python-omniorb/current/configure.ac
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/configure.ac?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/configure.ac (original)
+++ branches/upstream/python-omniorb/current/configure.ac Wed Mar 26 21:55:50 2008
@@ -1,5 +1,5 @@
dnl -*- M4 -*-
-AC_INIT(omniORBpy, 3.1, bugs at omniorb-support.com)
+AC_INIT(omniORBpy, 3.2, bugs at omniorb-support.com)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(python/omniORB/CORBA.py)
Modified: branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec (original)
+++ branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec Wed Mar 26 21:55:50 2008
@@ -1,6 +1,6 @@
Summary: Python Language Mapping for omniORB
Name: omniORBpy
-Version: 3.1
+Version: 3.2
Release: 1
License: GPL / LGPL
Group: System/Libraries
Modified: branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy_new.spec
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy_new.spec?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy_new.spec (original)
+++ branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy_new.spec Wed Mar 26 21:55:50 2008
@@ -4,7 +4,7 @@
Summary: Python Language Mapping for omniORB
Name: %{_name}
-Version: 3.1
+Version: 3.2
Release: 1
License: GPL / LGPL
Group: System/Libraries
Modified: branches/upstream/python-omniorb/current/mk/version.mk
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/mk/version.mk?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/mk/version.mk (original)
+++ branches/upstream/python-omniorb/current/mk/version.mk Wed Mar 26 21:55:50 2008
@@ -4,12 +4,12 @@
OMNITHREAD_MAJOR_VERSION = $(word 1,$(subst ., ,$(OMNITHREAD_VERSION)))
OMNITHREAD_MINOR_VERSION = $(word 2,$(subst ., ,$(OMNITHREAD_VERSION)))
-OMNIORB_VERSION = 4.1.1
+OMNIORB_VERSION = 4.1.2
OMNIORB_VERSION_HEX = 0x040101F1
OMNIORB_MAJOR_VERSION = $(word 1,$(subst ., ,$(OMNIORB_VERSION)))
OMNIORB_MINOR_VERSION = $(word 2,$(subst ., ,$(OMNIORB_VERSION)))
OMNIORB_MICRO_VERSION = $(word 3,$(subst ., ,$(OMNIORB_VERSION)))
-OMNIPY_VERSION = 3.1
+OMNIPY_VERSION = 3.2
OMNIPY_MAJOR = $(word 1,$(subst ., ,$(OMNIPY_VERSION)))
OMNIPY_MINOR = $(word 2,$(subst ., ,$(OMNIPY_VERSION)))
Modified: branches/upstream/python-omniorb/current/modules/pyServant.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyServant.cc?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyServant.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyServant.cc Wed Mar 26 21:55:50 2008
@@ -27,9 +27,13 @@
// Description:
// Implementation of Python servant object
-// $Id: pyServant.cc,v 1.1.4.9 2006/07/05 10:47:14 dgrisby Exp $
+// $Id: pyServant.cc,v 1.1.4.10 2008/02/01 16:29:17 dgrisby Exp $
// $Log: pyServant.cc,v $
+// Revision 1.1.4.10 2008/02/01 16:29:17 dgrisby
+// Error with implementation of operations with names clashing with
+// Python keywords.
+//
// Revision 1.1.4.9 2006/07/05 10:47:14 dgrisby
// Propagate exceptions out of _default_POA.
//
@@ -537,19 +541,26 @@
const char* op = pycd->op();
PyObject* method = PyObject_GetAttrString(pyservant_, (char*)op);
- if (!method && omni::strMatch(op, "_interface")) {
+ if (!method) {
PyErr_Clear();
- method = PyObject_GetAttrString(pyservant_, (char*)"_get_interface");
- }
- if (!method) {
- if (omniORB::trace(1)) {
- omniORB::logger l;
- l << "Python servant for `" << repoId_ << "' has no method named `"
- << op << "'.\n";
- }
- PyErr_Clear();
- OMNIORB_THROW(NO_IMPLEMENT, NO_IMPLEMENT_NoPythonMethod,
- CORBA::COMPLETED_NO);
+ PyObject* word = PyDict_GetItemString(omniPy::pyomniORBwordMap, op);
+ if (word) {
+ // Keyword -- look up mangled name
+ method = PyObject_GetAttr(pyservant_, word);
+ }
+ else if (omni::strMatch(op, "_interface")) {
+ method = PyObject_GetAttrString(pyservant_, (char*)"_get_interface");
+ }
+ if (!method) {
+ if (omniORB::trace(1)) {
+ omniORB::logger l;
+ l << "Python servant for `" << repoId_ << "' has no method named `"
+ << op << "'.\n";
+ }
+ PyErr_Clear();
+ OMNIORB_THROW(NO_IMPLEMENT, NO_IMPLEMENT_NoPythonMethod,
+ CORBA::COMPLETED_NO);
+ }
}
PyObject* args = pycd->args();
@@ -622,19 +633,26 @@
const char* op = pycd->op();
PyObject* method = PyObject_GetAttrString(pyservant_, (char*)op);
- if (!method && omni::strMatch(op, "_interface")) {
+ if (!method) {
PyErr_Clear();
- method = PyObject_GetAttrString(pyservant_, (char*)"_get_interface");
- }
- if (!method) {
- if (omniORB::trace(1)) {
- omniORB::logger l;
- l << "Python servant for `" << repoId_ << "' has no method named `"
- << op << "'.\n";
- }
- PyErr_Clear();
- OMNIORB_THROW(NO_IMPLEMENT, NO_IMPLEMENT_NoPythonMethod,
- CORBA::COMPLETED_NO);
+ PyObject* word = PyDict_GetItemString(omniPy::pyomniORBwordMap, op);
+ if (word) {
+ // Keyword -- look up mangled name
+ method = PyObject_GetAttr(pyservant_, word);
+ }
+ else if (omni::strMatch(op, "_interface")) {
+ method = PyObject_GetAttrString(pyservant_, (char*)"_get_interface");
+ }
+ if (!method) {
+ if (omniORB::trace(1)) {
+ omniORB::logger l;
+ l << "Python servant for `" << repoId_ << "' has no method named `"
+ << op << "'.\n";
+ }
+ PyErr_Clear();
+ OMNIORB_THROW(NO_IMPLEMENT, NO_IMPLEMENT_NoPythonMethod,
+ CORBA::COMPLETED_NO);
+ }
}
PyObject* in_d = pycd->in_d_;
Modified: branches/upstream/python-omniorb/current/omniidl_be/python.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/omniidl_be/python.py?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/omniidl_be/python.py (original)
+++ branches/upstream/python-omniorb/current/omniidl_be/python.py Wed Mar 26 21:55:50 2008
@@ -26,8 +26,12 @@
#
# Back-end for Python
-# $Id: python.py,v 1.33.2.13 2006/10/11 17:44:14 dgrisby Exp $
+# $Id: python.py,v 1.33.2.14 2008/02/01 16:29:17 dgrisby Exp $
# $Log: python.py,v $
+# Revision 1.33.2.14 2008/02/01 16:29:17 dgrisby
+# Error with implementation of operations with names clashing with
+# Python keywords.
+#
# Revision 1.33.2.13 2006/10/11 17:44:14 dgrisby
# None is not a keyword, but it cannot be assigned to.
#
@@ -1213,10 +1217,11 @@
ifid + '.' + '_d__set_' + attr)
else: # Operation
- opname = mangle(c.identifier())
+ opname = c.identifier()
+ m_opname = mangle(opname)
- methodl.append('"' + opname + '": ' + '_0_' + self.modname + \
- '.' + ifid + '.' + '_d_' + opname)
+ methodl.append('"' + opname + '": ' + '_0_' + self.modname +
+ '.' + ifid + '.' + '_d_' + m_opname)
methodmap = "{" + string.join(methodl, ", ") + "}"
Modified: branches/upstream/python-omniorb/current/python/omniORB/__init__.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/__init__.py?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/__init__.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/__init__.py Wed Mar 26 21:55:50 2008
@@ -28,8 +28,12 @@
# omniORB module -- omniORB specific things
-# $Id: __init__.py,v 1.30.2.20 2007/10/07 15:30:58 dgrisby Exp $
+# $Id: __init__.py,v 1.30.2.21 2008/02/01 16:29:16 dgrisby Exp $
# $Log: __init__.py,v $
+# Revision 1.30.2.21 2008/02/01 16:29:16 dgrisby
+# Error with implementation of operations with names clashing with
+# Python keywords.
+#
# Revision 1.30.2.20 2007/10/07 15:30:58 dgrisby
# Problems with modules inside packages. Thanks Fabian Knittel.
#
@@ -1050,6 +1054,9 @@
import keyword
for word in keyword.kwlist:
keywordMapping[word] = "_" + word
+
+ keywordMapping["None"] = "_None"
+
del keyword
except ImportError:
pass
Modified: branches/upstream/python-omniorb/current/update.log
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/update.log?rev=145&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/update.log (original)
+++ branches/upstream/python-omniorb/current/update.log Wed Mar 26 21:55:50 2008
@@ -1,3 +1,35 @@
+Thu Feb 14 14:20:23 GMT 2008 dgrisby
+====================================
+
+- This is omniORBpy 3.2.
+
+
+Thu Feb 14 13:33:21 GMT 2008 dgrisby
+====================================
+
+- Updates for 3.2 release.
+
+README.txt
+ReleaseNotes.txt
+configure
+configure.ac
+contrib/RPMs/omniORBpy.spec
+contrib/RPMs/omniORBpy_new.spec
+mk/version.mk
+
+
+Fri Feb 1 16:22:20 GMT 2008 dgrisby
+====================================
+
+- Error with implementation of operations with names clashing with
+ Python keywords.
+
+bugfixes-31.xml
+modules/pyServant.cc
+omniidl_be/python.py
+python/omniORB/__init__.py
+
+
Sun Oct 7 16:38:58 BST 2007 dgrisby
====================================
More information about the Pkg-corba-commits
mailing list