From 9c0c046a38ed8a59588dff4ca09bc42f60c5fba7 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Fri, 3 Dec 2021 12:31:59 +0530
Subject: [PATCH] Fixed unhashable type issue while opening the about dialog.
 Fixes #7048

---
 docs/en_US/release_notes_6_3.rst | 1 +
 web/pgadmin/__init__.py          | 2 +-
 web/pgadmin/about/__init__.py    | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en_US/release_notes_6_3.rst b/docs/en_US/release_notes_6_3.rst
index b52766f3d..f0fe7a170 100644
--- a/docs/en_US/release_notes_6_3.rst
+++ b/docs/en_US/release_notes_6_3.rst
@@ -37,3 +37,4 @@ Bug fixes
 | `Issue #7040 <https://redmine.postgresql.org/issues/7040>`_ -  Add "section" to the Debian package control files.
 | `Issue #7044 <https://redmine.postgresql.org/issues/7044>`_ -  Update the dropzone version to 5.9.3 and Flask-SQLAlchemy to 2.5.*.
 | `Issue #7046 <https://redmine.postgresql.org/issues/7046>`_ -  Fixed some accessibility issues.
+| `Issue #7048 <https://redmine.postgresql.org/issues/7048>`_ -  Fixed unhashable type issue while opening the about dialog.
diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py
index 16f4582b8..eabd7dc9c 100644
--- a/web/pgadmin/__init__.py
+++ b/web/pgadmin/__init__.py
@@ -310,7 +310,7 @@ def create_app(app_name=None):
         if config.SERVER_MODE is False:
             # Get the user language preference from the miscellaneous module
             user_id = None
-            if current_user.__ne__(None) and current_user.is_authenticated:
+            if current_user and current_user.is_authenticated:
                 user_id = current_user.id
             else:
                 user = user_datastore.find_user(email=config.DESKTOP_USER)
diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py
index 5460d7801..a1bed85d7 100644
--- a/web/pgadmin/about/__init__.py
+++ b/web/pgadmin/about/__init__.py
@@ -9,8 +9,7 @@
 
 """A blueprint module implementing the about box."""
 
-import sys
-from flask import Response, render_template, __version__, url_for, request
+from flask import Response, render_template, url_for, request
 from flask_babel import gettext
 from flask_security import current_user, login_required
 from pgadmin.utils import PgAdminModule
@@ -98,11 +97,11 @@ def index():
             if isinstance(getattr(config, setting), str):
                 settings = \
                     settings + '{} = "{}"\n'.format(
-                        setting, gettext(getattr(config, setting)))
+                        setting, getattr(config, setting))
             else:
                 settings = \
                     settings + '{} = {}\n'.format(
-                        setting, gettext(getattr(config, setting)))
+                        setting, getattr(config, setting))
 
     info['settings'] = settings