Fix a debugger error when using Python 2.7. Fixes #4419

Also fixes a minor bug where a reload warning was unnecessarily given when closing the debugger.
This commit is contained in:
Aditya Toshniwal 2019-08-23 09:43:51 +01:00 committed by Dave Page
parent 232fe286ee
commit 3dadb8989b
3 changed files with 4 additions and 4 deletions

View File

@ -21,6 +21,7 @@ Bug fixes
| `Issue #2706 <https://redmine.postgresql.org/issues/2706>`_ - Added ProjectSet icon for explain module.
| `Issue #2828 <https://redmine.postgresql.org/issues/2828>`_ - Added Gather Merge, Named Tuple Store Scan and Table Function Scan icon for explain module.
| `Issue #4419 <https://redmine.postgresql.org/issues/4419>`_ - Fix a debugger error when using Python 2.7.
| `Issue #4643 <https://redmine.postgresql.org/issues/4643>`_ - Fix Truncate option deselect issue for compound triggers.
| `Issue #4644 <https://redmine.postgresql.org/issues/4644>`_ - Fix length and precision enable/disable issue when changing the data type for Domain node.
| `Issue #4650 <https://redmine.postgresql.org/issues/4650>`_ - Fix SQL tab issue for Views. It's a regression of compound triggers.

View File

@ -1541,8 +1541,6 @@ define([
});
this.panels = [];
pgBrowser.bind_beforeunload();
// Below code will be executed for indirect debugging
// indirect debugging - 0 and for direct debugging - 1
if (trans_id != undefined && !debug_type) {
@ -1853,6 +1851,7 @@ define([
* instead, a poller is set up who will check
*/
if(self.preferences.debugger_new_browser_tab) {
pgBrowser.bind_beforeunload();
let pollIntervalId = setInterval(()=>{
if(window.opener && window.opener.pgAdmin) {
self.reflectPreferences();

View File

@ -14,12 +14,12 @@ import random
debugger_sessions_lock = Lock()
class DebuggerInstance:
class DebuggerInstance(object):
def __init__(self, trans_id=None):
if trans_id is None:
self._trans_id = str(random.randint(1, 9999999))
else:
self._trans_id = trans_id
self._trans_id = str(trans_id)
self._function_data = None
self._debugger_data = None