Mercurial > hgrepos > Python > libs > ConfigMix
comparison configmix/config.py @ 450:12f25ac6a13b
Make exception formatting more robuts: pack all %-style formatting args explicitely into tuples
| author | Franz Glasner <f.glasner@feldmann-mg.com> |
|---|---|
| date | Tue, 14 Dec 2021 14:35:39 +0100 |
| parents | 5864977bb44f |
| children | 27112bb4a5b9 |
comparison
equal
deleted
inserted
replaced
| 449:5864977bb44f | 450:12f25ac6a13b |
|---|---|
| 112 """ | 112 """ |
| 113 s = self.getvarl_s(*path, **kwds) | 113 s = self.getvarl_s(*path, **kwds) |
| 114 if isinstance(s, Configuration._TEXTTYPE): | 114 if isinstance(s, Configuration._TEXTTYPE): |
| 115 sl = s.strip().lower() | 115 sl = s.strip().lower() |
| 116 if sl not in self._BOOL_CVT: | 116 if sl not in self._BOOL_CVT: |
| 117 raise ValueError("Not a boolean: %r" % s) | 117 raise ValueError("Not a boolean: %r" % (s, )) |
| 118 return self._BOOL_CVT[sl] | 118 return self._BOOL_CVT[sl] |
| 119 else: | 119 else: |
| 120 return s | 120 return s |
| 121 | 121 |
| 122 def getfirstboolvarl_s(self, *paths, **kwds): | 122 def getfirstboolvarl_s(self, *paths, **kwds): |
| 126 """ | 126 """ |
| 127 s = self.getfirstvarl_s(*paths, **kwds) | 127 s = self.getfirstvarl_s(*paths, **kwds) |
| 128 if isinstance(s, Configuration._TEXTTYPE): | 128 if isinstance(s, Configuration._TEXTTYPE): |
| 129 sl = s.strip().lower() | 129 sl = s.strip().lower() |
| 130 if sl not in self._BOOL_CVT: | 130 if sl not in self._BOOL_CVT: |
| 131 raise ValueError("Not a boolean: %r" % s) | 131 raise ValueError("Not a boolean: %r" % (s, )) |
| 132 return self._BOOL_CVT[sl] | 132 return self._BOOL_CVT[sl] |
| 133 else: | 133 else: |
| 134 return s | 134 return s |
| 135 | 135 |
| 136 def getboolvar_s(self, varname, default=_MARKER): | 136 def getboolvar_s(self, varname, default=_MARKER): |
| 140 """ | 140 """ |
| 141 s = self.getvar_s(varname, default=default) | 141 s = self.getvar_s(varname, default=default) |
| 142 if isinstance(s, Configuration._TEXTTYPE): | 142 if isinstance(s, Configuration._TEXTTYPE): |
| 143 sl = s.strip().lower() | 143 sl = s.strip().lower() |
| 144 if sl not in self._BOOL_CVT: | 144 if sl not in self._BOOL_CVT: |
| 145 raise ValueError("Not a boolean: %r" % s) | 145 raise ValueError("Not a boolean: %r" % (s, )) |
| 146 return self._BOOL_CVT[sl] | 146 return self._BOOL_CVT[sl] |
| 147 else: | 147 else: |
| 148 return s | 148 return s |
| 149 | 149 |
| 150 def getfirstboolvar_s(self, *varnames, **kwds): | 150 def getfirstboolvar_s(self, *varnames, **kwds): |
| 154 """ | 154 """ |
| 155 s = self.getfirstvar_s(*varnames, **kwds) | 155 s = self.getfirstvar_s(*varnames, **kwds) |
| 156 if isinstance(s, Configuration._TEXTTYPE): | 156 if isinstance(s, Configuration._TEXTTYPE): |
| 157 sl = s.strip().lower() | 157 sl = s.strip().lower() |
| 158 if sl not in self._BOOL_CVT: | 158 if sl not in self._BOOL_CVT: |
| 159 raise ValueError("Not a boolean: %r" % s) | 159 raise ValueError("Not a boolean: %r" % (s, )) |
| 160 return self._BOOL_CVT[sl] | 160 return self._BOOL_CVT[sl] |
| 161 else: | 161 else: |
| 162 return s | 162 return s |
| 163 | 163 |
| 164 # Conversion of booleans | 164 # Conversion of booleans |
