* Ruby port of sliced/compact/preserved

* Python clean up
* More changes to exceptions test

1 files changed, 10 insertions, 8 deletions

diff --git a/py/modules/IcePy/Util.cpp b/py/modules/IcePy/Util.cpp
index 837ed1e3b71..1aae7f471a6 100644
--- a/py/modules/IcePy/Util.cpp
+++ b/py/modules/IcePy/Util.cpp
@@ -1084,15 +1084,14 @@ IcePy::createEncodingVersion(const Ice::EncodingVersion& v)
 bool
 IcePy::getEncodingVersion(PyObject* args, Ice::EncodingVersion& v)
 {
-    PyObject* versionType = IcePy::lookupType(IcePy::Ice_EncodingVersion);
+    PyObject* versionType = IcePy::lookupType(Ice_EncodingVersion);
     PyObject* p;
     if(!PyArg_ParseTuple(args, STRCAST("O!"), versionType, &p))
     {
         return false;
     }
 
-
-    if(!getVersion<Ice::EncodingVersion, IcePy::Ice_EncodingVersion>(p, v))
+    if(!getVersion<Ice::EncodingVersion, Ice_EncodingVersion>(p, v))
     {
         return false;
     }
@@ -1100,7 +1099,6 @@ IcePy::getEncodingVersion(PyObject* args, Ice::EncodingVersion& v)
     return true;
 }
 
-
 extern "C"
 PyObject*
 IcePy_stringVersion(PyObject* /*self*/)
@@ -1137,25 +1135,29 @@ IcePy_currentEncoding(PyObject* /*self*/)
     return IcePy::createEncodingVersion(Ice::currentEncoding);
 }
 
-extern "C" PyObject* 
+extern "C"
+PyObject*
 IcePy_protocolVersionToString(PyObject* /*self*/, PyObject* args)
 {
     return IcePy::versionToString<Ice::ProtocolVersion, IcePy::Ice_ProtocolVersion>(args);
 }
 
-extern "C" PyObject* 
+extern "C"
+PyObject*
 IcePy_stringToProtocolVersion(PyObject* /*self*/, PyObject* args)
 {
     return IcePy::stringToVersion<Ice::ProtocolVersion, IcePy::Ice_ProtocolVersion>(args);
 }
 
-extern "C" PyObject* 
+extern "C"
+PyObject*
 IcePy_encodingVersionToString(PyObject* /*self*/, PyObject* args)
 {
     return IcePy::versionToString<Ice::EncodingVersion, IcePy::Ice_EncodingVersion>(args);
 }
 
-extern "C" PyObject* 
+extern "C"
+PyObject*
 IcePy_stringToEncodingVersion(PyObject* /*self*/, PyObject* args)
 {
     return IcePy::stringToVersion<Ice::EncodingVersion, IcePy::Ice_EncodingVersion>(args);