Mercurial > p > roundup > code
comparison roundup/cgi/client.py @ 4800:3961b2b91568
2nd case where querying form returns a TypeError
| author | Ralf Schlatterbeck <rsc@runtux.com> |
|---|---|
| date | Mon, 08 Jul 2013 10:38:54 +0200 |
| parents | b474adb17fda |
| children | bff9e4145f70 |
comparison
equal
deleted
inserted
replaced
| 4799:b474adb17fda | 4800:3961b2b91568 |
|---|---|
| 601 """ | 601 """ |
| 602 # look for client charset | 602 # look for client charset |
| 603 charset_parameter = 0 | 603 charset_parameter = 0 |
| 604 # Python 2.6 form may raise a TypeError if list in form is None | 604 # Python 2.6 form may raise a TypeError if list in form is None |
| 605 charset = None | 605 charset = None |
| 606 try : | 606 try: |
| 607 charset = self.form['@charset'].value | 607 charset = self.form['@charset'].value |
| 608 if charset.lower() == "none": | 608 if charset.lower() == "none": |
| 609 charset = "" | 609 charset = "" |
| 610 charset_parameter = 1 | 610 charset_parameter = 1 |
| 611 except (KeyError, TypeError): | 611 except (KeyError, TypeError): |
| 658 def determine_language(self): | 658 def determine_language(self): |
| 659 """Determine the language""" | 659 """Determine the language""" |
| 660 # look for language parameter | 660 # look for language parameter |
| 661 # then for language cookie | 661 # then for language cookie |
| 662 # last for the Accept-Language header | 662 # last for the Accept-Language header |
| 663 if "@language" in self.form: | 663 # Python 2.6 form may raise a TypeError if list in form is None |
| 664 language = None | |
| 665 try: | |
| 664 language = self.form["@language"].value | 666 language = self.form["@language"].value |
| 665 if language.lower() == "none": | 667 if language.lower() == "none": |
| 666 language = "" | 668 language = "" |
| 667 self.add_cookie("roundup_language", language) | 669 self.add_cookie("roundup_language", language) |
| 668 elif "roundup_language" in self.cookie: | 670 except (KeyError, TypeError): |
| 669 language = self.cookie["roundup_language"].value | 671 pass |
| 670 elif self.instance.config["WEB_USE_BROWSER_LANGUAGE"]: | 672 if language is None: |
| 671 hal = self.env.get('HTTP_ACCEPT_LANGUAGE') | 673 if "roundup_language" in self.cookie: |
| 672 language = accept_language.parse(hal) | 674 language = self.cookie["roundup_language"].value |
| 673 else: | 675 elif self.instance.config["WEB_USE_BROWSER_LANGUAGE"]: |
| 674 language = "" | 676 hal = self.env.get('HTTP_ACCEPT_LANGUAGE') |
| 677 language = accept_language.parse(hal) | |
| 678 else: | |
| 679 language = "" | |
| 675 | 680 |
| 676 self.language = language | 681 self.language = language |
| 677 if language: | 682 if language: |
| 678 self.setTranslator(TranslationService.get_translation( | 683 self.setTranslator(TranslationService.get_translation( |
| 679 language, | 684 language, |