Mercurial > p > roundup > code
comparison roundup/cgi/client.py @ 8500:b03160d46e9d
bug: don't reference vendored outside of anypy modules
client.py was referencing the vendored.cgi module. This is wrong.
It should pull the vendored.cgi module only via anypy.cgi_.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sun, 21 Dec 2025 23:59:08 -0500 |
| parents | 14c7c07b32d8 |
| children | dfecb240bc34 |
comparison
equal
deleted
inserted
replaced
| 8499:7c49a4267705 | 8500:b03160d46e9d |
|---|---|
| 57 ) | 57 ) |
| 58 | 58 |
| 59 from roundup.logcontext import gen_trace_id, store_trace_reason | 59 from roundup.logcontext import gen_trace_id, store_trace_reason |
| 60 from roundup.mailer import Mailer, MessageSendError | 60 from roundup.mailer import Mailer, MessageSendError |
| 61 from roundup.mlink_expr import ExpressionError | 61 from roundup.mlink_expr import ExpressionError |
| 62 from roundup.performance import report_object_use | |
| 62 | 63 |
| 63 logger = logging.getLogger('roundup') | 64 logger = logging.getLogger('roundup') |
| 64 | 65 |
| 65 if not random_.is_weak: | 66 if not random_.is_weak: |
| 66 logger.debug("Importing good random generator") | 67 logger.debug("Importing good random generator") |
| 583 self._ = self.gettext = translator.gettext | 584 self._ = self.gettext = translator.gettext |
| 584 self.ngettext = translator.ngettext | 585 self.ngettext = translator.ngettext |
| 585 | 586 |
| 586 @gen_trace_id() | 587 @gen_trace_id() |
| 587 @store_trace_reason('client_main') | 588 @store_trace_reason('client_main') |
| 589 @report_object_use(highest=20, pre_collect=False) | |
| 588 def main(self): | 590 def main(self): |
| 589 """ Wrap the real main in a try/finally so we always close off the db. | 591 """ Wrap the real main in a try/finally so we always close off the db. |
| 590 """ | 592 """ |
| 591 | 593 |
| 592 # strip HTTP_PROXY issue2550925 in case | 594 # strip HTTP_PROXY issue2550925 in case |
| 1185 # this maybe is not correct, as get_translation could not | 1187 # this maybe is not correct, as get_translation could not |
| 1186 # find desired locale and switch back to "en" but we set | 1188 # find desired locale and switch back to "en" but we set |
| 1187 # self.language to the desired language ! | 1189 # self.language to the desired language ! |
| 1188 self.language = language | 1190 self.language = language |
| 1189 | 1191 |
| 1190 self.setTranslator(TranslationService.get_translation( | 1192 try: |
| 1193 self.setTranslator(TranslationService.get_translation( | |
| 1191 language, | 1194 language, |
| 1192 tracker_home=self.instance.config["TRACKER_HOME"])) | 1195 tracker_home=self.instance.config["TRACKER_HOME"])) |
| 1196 except IOError as e: | |
| 1197 logger.error(str(e), extra={"requested_language": language}) | |
| 1198 # failed to set the requested/TRACKER_LANGUAGE language. | |
| 1199 # Set to en. | |
| 1200 self.language = "" | |
| 1193 | 1201 |
| 1194 def authenticate_bearer_token(self, challenge): | 1202 def authenticate_bearer_token(self, challenge): |
| 1195 ''' authenticate the bearer token. Refactored from determine_user() | 1203 ''' authenticate the bearer token. Refactored from determine_user() |
| 1196 to allow it to be overridden if needed. | 1204 to allow it to be overridden if needed. |
| 1197 ''' | 1205 ''' |
| 1929 """Processing for a Reauth exception raised from an auditor. | 1937 """Processing for a Reauth exception raised from an auditor. |
| 1930 | 1938 |
| 1931 Can be overridden by code in tracker's interfaces.py. | 1939 Can be overridden by code in tracker's interfaces.py. |
| 1932 """ | 1940 """ |
| 1933 | 1941 |
| 1934 from roundup.anypy.vendored.cgi import MiniFieldStorage | 1942 from roundup.anypy.cgi_ import MiniFieldStorage |
| 1935 | 1943 |
| 1936 original_action = self.form['@action'].value if '@action' \ | 1944 original_action = self.form['@action'].value if '@action' \ |
| 1937 in self.form else "" | 1945 in self.form else "" |
| 1938 original_template = self.template | 1946 original_template = self.template |
| 1939 | 1947 |