From 4568fe22f7e50cc9e782839c3ca35607d651b4b3 Mon Sep 17 00:00:00 2001
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Mon, 20 Nov 2017 16:28:13 +0000
Subject: [PATCH] Decode the field separator and quote char if needed.

---
 web/pgadmin/utils/driver/psycopg2/__init__.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py
index da44738b1..48a7c935d 100644
--- a/web/pgadmin/utils/driver/psycopg2/__init__.py
+++ b/web/pgadmin/utils/driver/psycopg2/__init__.py
@@ -822,6 +822,18 @@ WHERE
             else:
                 quote = csv.QUOTE_NONE
 
+            if hasattr(str, 'decode'):
+                # Decode the field_separator
+                try:
+                    field_separator = field_separator.decode('utf-8')
+                except:
+                    pass
+                # Decode the quote_char
+                try:
+                    quote_char = quote_char.decode('utf-8')
+                except:
+                    pass
+
             csv_writer = csv.DictWriter(
                 res_io, fieldnames=header, delimiter=field_separator,
                 quoting=quote,