diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 256b2e66d10..6cb99ec0eb5 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -1959,14 +1959,13 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax } case Slice::Builtin::KindString: { - string sv2 = toStringLiteral(value, "\a\b\f\n\r\t\v", "", Octal, 0); - string sv3 = toStringLiteral(value, "\a\b\f\n\r\t\v", "", UCN, 0); + const string controlChars = "\a\b\f\n\r\t\v"; + const unsigned char cutOff = 0; + + string sv2 = toStringLiteral(value, controlChars, "", Octal, cutOff); + string sv3 = toStringLiteral(value, controlChars, "", UCN, cutOff); - _out << "\"" << sv2<< "\""; - if(sv2 != sv3) - { - _out << " if _version_info_[0] < 3 else \"" << sv3 << "\""; - } + _out << "\"" << (sv2 == sv3 ? sv2 : sv3) << "\""; break; } case Slice::Builtin::KindValue: @@ -2843,7 +2842,6 @@ Slice::Python::generate(const UnitPtr& un, bool all, const vector& inclu Slice::Python::MetaDataVisitor visitor; un->visit(&visitor, false); - out << nl << "from sys import version_info as _version_info_"; out << nl << "import Ice, IcePy"; if(!all) diff --git a/python/python/Ice/CommunicatorF_local.py b/python/python/Ice/CommunicatorF_local.py index b3426337ecd..3c69dbdc2a3 100644 --- a/python/python/Ice/CommunicatorF_local.py +++ b/python/python/Ice/CommunicatorF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/Communicator_local.py b/python/python/Ice/Communicator_local.py index 77be67d2ac2..da0b092224a 100644 --- a/python/python/Ice/Communicator_local.py +++ b/python/python/Ice/Communicator_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.LoggerF_local import Ice.InstrumentationF_local diff --git a/python/python/Ice/ConnectionF_local.py b/python/python/Ice/ConnectionF_local.py index 797ce9c0f0f..2e2ec54b62c 100644 --- a/python/python/Ice/ConnectionF_local.py +++ b/python/python/Ice/ConnectionF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/Connection_local.py b/python/python/Ice/Connection_local.py index 9a5dd811a81..d26808453ee 100644 --- a/python/python/Ice/Connection_local.py +++ b/python/python/Ice/Connection_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.ObjectAdapterF_local import Ice.Identity_ice diff --git a/python/python/Ice/Current_local.py b/python/python/Ice/Current_local.py index 8dd752381d3..4d5a26ffb14 100644 --- a/python/python/Ice/Current_local.py +++ b/python/python/Ice/Current_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.ObjectAdapterF_local import Ice.ConnectionF_local diff --git a/python/python/Ice/EndpointF_local.py b/python/python/Ice/EndpointF_local.py index 3f898f928a8..316527e072a 100644 --- a/python/python/Ice/EndpointF_local.py +++ b/python/python/Ice/EndpointF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/EndpointSelectionType_local.py b/python/python/Ice/EndpointSelectionType_local.py index 77f72a19e9c..c7fcc517119 100644 --- a/python/python/Ice/EndpointSelectionType_local.py +++ b/python/python/Ice/EndpointSelectionType_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/Endpoint_local.py b/python/python/Ice/Endpoint_local.py index 3450926e631..05ab73cdfcb 100644 --- a/python/python/Ice/Endpoint_local.py +++ b/python/python/Ice/Endpoint_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.Version_ice import Ice.BuiltinSequences_ice diff --git a/python/python/Ice/FacetMap_local.py b/python/python/Ice/FacetMap_local.py index 68b55c1b50f..febb7d7530e 100644 --- a/python/python/Ice/FacetMap_local.py +++ b/python/python/Ice/FacetMap_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/ImplicitContextF_local.py b/python/python/Ice/ImplicitContextF_local.py index cc9ca18489b..5e017c52e16 100644 --- a/python/python/Ice/ImplicitContextF_local.py +++ b/python/python/Ice/ImplicitContextF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/ImplicitContext_local.py b/python/python/Ice/ImplicitContext_local.py index 3091678fea0..634325382d5 100644 --- a/python/python/Ice/ImplicitContext_local.py +++ b/python/python/Ice/ImplicitContext_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.LocalException_local import Ice.Current_local diff --git a/python/python/Ice/InstrumentationF_local.py b/python/python/Ice/InstrumentationF_local.py index 3f26e8fbd70..e3ca119a58e 100644 --- a/python/python/Ice/InstrumentationF_local.py +++ b/python/python/Ice/InstrumentationF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/Instrumentation_local.py b/python/python/Ice/Instrumentation_local.py index df156886819..d254c9be229 100644 --- a/python/python/Ice/Instrumentation_local.py +++ b/python/python/Ice/Instrumentation_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.EndpointF_local import Ice.ConnectionF_local diff --git a/python/python/Ice/LocalException_local.py b/python/python/Ice/LocalException_local.py index 521711e4989..99e0f15bb2e 100644 --- a/python/python/Ice/LocalException_local.py +++ b/python/python/Ice/LocalException_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.Identity_ice import Ice.Version_ice diff --git a/python/python/Ice/LoggerF_local.py b/python/python/Ice/LoggerF_local.py index 81c153ed4bc..fe5ad03f137 100644 --- a/python/python/Ice/LoggerF_local.py +++ b/python/python/Ice/LoggerF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/Logger_local.py b/python/python/Ice/Logger_local.py index ad53e60a94e..554d71735c4 100644 --- a/python/python/Ice/Logger_local.py +++ b/python/python/Ice/Logger_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/ObjectAdapterF_local.py b/python/python/Ice/ObjectAdapterF_local.py index 1773ea378ef..2a94fecb33d 100644 --- a/python/python/Ice/ObjectAdapterF_local.py +++ b/python/python/Ice/ObjectAdapterF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/ObjectAdapter_local.py b/python/python/Ice/ObjectAdapter_local.py index bc12ab5a56b..6c6a7a0b7d0 100644 --- a/python/python/Ice/ObjectAdapter_local.py +++ b/python/python/Ice/ObjectAdapter_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.CommunicatorF_local import Ice.ServantLocatorF_local diff --git a/python/python/Ice/PluginF_local.py b/python/python/Ice/PluginF_local.py index c66fe7ba8e9..b15979baf8b 100644 --- a/python/python/Ice/PluginF_local.py +++ b/python/python/Ice/PluginF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/Plugin_local.py b/python/python/Ice/Plugin_local.py index f0cb77c5e9d..a1c1e97ec43 100644 --- a/python/python/Ice/Plugin_local.py +++ b/python/python/Ice/Plugin_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.LoggerF_local import Ice.BuiltinSequences_ice diff --git a/python/python/Ice/PropertiesF_local.py b/python/python/Ice/PropertiesF_local.py index cbc9454a6e8..38ed7dc7ada 100644 --- a/python/python/Ice/PropertiesF_local.py +++ b/python/python/Ice/PropertiesF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/Properties_local.py b/python/python/Ice/Properties_local.py index 914c688092b..2095302d058 100644 --- a/python/python/Ice/Properties_local.py +++ b/python/python/Ice/Properties_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.BuiltinSequences_ice import Ice.PropertyDict_ice diff --git a/python/python/Ice/ServantLocatorF_local.py b/python/python/Ice/ServantLocatorF_local.py index 99272994331..5edf8599104 100644 --- a/python/python/Ice/ServantLocatorF_local.py +++ b/python/python/Ice/ServantLocatorF_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/Ice/ServantLocator_local.py b/python/python/Ice/ServantLocator_local.py index 96740f0b7c5..99cdf6dc4e4 100644 --- a/python/python/Ice/ServantLocator_local.py +++ b/python/python/Ice/ServantLocator_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.ObjectAdapterF_local import Ice.Current_local diff --git a/python/python/Ice/ValueFactory_local.py b/python/python/Ice/ValueFactory_local.py index 3a639c69acc..211c2f7a859 100644 --- a/python/python/Ice/ValueFactory_local.py +++ b/python/python/Ice/ValueFactory_local.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy # Start of module Ice diff --git a/python/python/IceBox/Service.py b/python/python/IceBox/Service.py index a93bb8b3552..508d95e8e1b 100644 --- a/python/python/IceBox/Service.py +++ b/python/python/IceBox/Service.py @@ -14,7 +14,6 @@ # # -from sys import version_info as _version_info_ import Ice, IcePy import Ice.BuiltinSequences_ice import Ice.CommunicatorF_ice