View | Details | Raw Unified | Return to bug 16637
Collapse All | Expand All

(-)python/univention/config_registry.py (-3 / +16 lines)
 Lines 239-248    Link Here 
239
239
240
			key, value = line.split(': ', 1)
240
			key, value = line.split(': ', 1)
241
			value = value.strip()
241
			value = value.strip()
242
			if len(value) == 0: #if variable was set without an value
242
			# check encoding
243
				value = ''
243
			try:
244
				utf8_value = value.decode()
245
			except UnicodeDecodeError:
246
				utf8_value = value.decode( 'latin1' )
247
			if len(utf8_value) == 0: #if variable was set without an value
248
				utf8_value = ''
244
249
245
			self[key] = value
250
			self[key] = utf8_value
246
		fp.close()
251
		fp.close()
247
252
248
		if import_failed:
253
		if import_failed:
 Lines 293-298    Link Here 
293
		except KeyError:
298
		except KeyError:
294
			return ''
299
			return ''
295
300
301
	def __setitem__( self, key, value ):
302
		try:
303
			utf8_value = value.decode()
304
		except UnicodeDecodeError:
305
			utf8_value = value.decode( 'latin1' )
306
307
		return dict.__setitem__( self, key, utf8_value )
308
296
	def removeInvalidChars (self, seq):
309
	def removeInvalidChars (self, seq):
297
		for letter in invalid_value_chars:
310
		for letter in invalid_value_chars:
298
			seq = seq.replace(letter,'')
311
			seq = seq.replace(letter,'')

Return to bug 16637