diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-28 15:02:37 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-28 15:02:37 +0100 |
| commit | b49acad1546003225a92a10bc756a3c330a0e63b (patch) | |
| tree | 25e618290059b7cb5315820ec257927818b86e93 | |
| parent | ICE-6878 - Java 8 port (diff) | |
| download | ice-b49acad1546003225a92a10bc756a3c330a0e63b.tar.bz2 ice-b49acad1546003225a92a10bc756a3c330a0e63b.tar.xz ice-b49acad1546003225a92a10bc756a3c330a0e63b.zip | |
Python2 & 3 makeprops.py fix
| -rwxr-xr-x | config/makeprops.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/config/makeprops.py b/config/makeprops.py index e0a9e344f8d..8927d5f9c53 100755 --- a/config/makeprops.py +++ b/config/makeprops.py @@ -361,7 +361,7 @@ class CppPropertyHandler(PropertyHandler): self.cppFile.close() def fix(self, propertyName): - return str.replace(propertyName, "[any]", "*") + return propertyName.replace("[any]", "*") def deprecatedImpl(self, propertyName): self.cppFile.write(" IceInternal::Property(\"%s.%s\", true, 0),\n" % (self.currentSection, \ @@ -435,8 +435,7 @@ class JavaPropertyHandler(PropertyHandler): # # The Java property strings are actually regexp's that will be passed to Java's regexp facitlity. # - propertyName = str.replace(propertyName, ".", "\\\\.") - return str.replace(propertyName, "[any]", "[^\\\\s]+") + return propertyName.replace(".", "\\\\.").replace("[any]", "[^\\\\s]+") def deprecatedImpl(self, propertyName): self.srcFile.write(" new Property(\"%(section)s\\\\.%(pattern)s\", " \ @@ -518,8 +517,7 @@ class CSPropertyHandler(PropertyHandler): self.srcFile.close() def fix(self, propertyName): - propertyName = str.replace(propertyName, ".", "\\.") - return str.replace(propertyName, "[any]", "[^\\s]+") + return propertyName.replace(".", "\\.").replace("[any]", "[^\\s]+") def deprecatedImpl(self, propertyName): self.srcFile.write(" new Property(@\"^%s\.%s$\", true, null),\n" % (self.currentSection, \ @@ -585,8 +583,7 @@ class JSPropertyHandler(PropertyHandler): self.srcFile.close() def fix(self, propertyName): - propertyName = str.replace(propertyName, ".", "\\.") - return str.replace(propertyName, "[any]", ".") + return propertyName.replace(".", "\\.").replace("[any]", ".") def deprecatedImpl(self, propertyName): if self.currentSection in self.validSections: |