comparison mercurial/hgweb/hgwebdir_mod.py @ 8859:580a79dde2a3

hgweb: web.encoding should override encoding.encoding (issue1183)
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Jun 2009 13:00:25 -0500
parents 45f626a39def
children f6eb03027411
comparison
equal deleted inserted replaced
8858:16f6c13706df 8859:580a79dde2a3
68 elif isinstance(self.conf, (list, tuple)): 68 elif isinstance(self.conf, (list, tuple)):
69 paths = self.conf 69 paths = self.conf
70 elif isinstance(self.conf, dict): 70 elif isinstance(self.conf, dict):
71 paths = self.conf.items() 71 paths = self.conf.items()
72 72
73 encoding.encoding = self.ui.config('web', 'encoding',
74 encoding.encoding)
73 self.motd = self.ui.config('web', 'motd') 75 self.motd = self.ui.config('web', 'motd')
74 self.style = self.ui.config('web', 'style', 'paper') 76 self.style = self.ui.config('web', 'style', 'paper')
75 self.stripecount = self.ui.config('web', 'stripes', 1) 77 self.stripecount = self.ui.config('web', 'stripes', 1)
76 if self.stripecount: 78 if self.stripecount:
77 self.stripecount = int(self.stripecount) 79 self.stripecount = int(self.stripecount)