IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-09 07:33:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Python 2.6 fixes. Fixes #1636. Fixes #1659

Browse Source
This commit is contained in:
Murtuza Zabuawala 2016-09-06 14:06:10 +01:00 committed by Dave Page
parent 8ac65070bc
commit 1b75679ec4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/pgadmin/__init__.py
View File

@ -33,7 +33,7 @@ import config
# If script is running under python3, it will not have the xrange function
# defined
winreg = None
if sys.version_info.major >= 3:
if sys.version_info[0] >= 3:
xrange = range
if os.name == 'nt':
import winreg
@ -247,6 +247,7 @@ def create_app(app_name=config.APP_NAME):
'''Add a server to the config database'''
def add_server(user_id, servergroup_id, name, superuser, port, discovery_id, comment):
# Create a server object if needed, and store it.
arch_keys = set()
servers = Server.query.filter_by(
user_id=user_id,
discovery_id=svr_discovery_id
@ -279,12 +280,13 @@ def create_app(app_name=config.APP_NAME):
proc_arch64 = None
if proc_arch == 'x86' and not proc_arch64:
arch_keys = {0}
arch_keys.add(0)
elif proc_arch == 'x86' or proc_arch == 'amd64':
arch_keys = {winreg.KEY_WOW64_32KEY, winreg.KEY_WOW64_64KEY}
arch_keys.add(winreg.KEY_WOW64_32KEY)
arch_keys.add(winreg.KEY_WOW64_64KEY)
for arch_key in arch_keys:
for server_type in { 'PostgreSQL', 'EnterpriseDB'}:
for server_type in ('PostgreSQL', 'EnterpriseDB'):
try:
root_key = winreg.OpenKey(
winreg.HKEY_LOCAL_MACHINE,

4
web/pgadmin/utils/driver/psycopg2/cursor.py
View File

@ -130,7 +130,7 @@ class DictCursor(_cursor):
"""
if self._odt_desc is None:
self._ordered_description()
return {k[0]: v for k, v in zip(self._odt_desc, tup)}
return dict((k[0], v) for k, v in zip(self._odt_desc, tup))
def _ordered_description(self):
"""
@ -144,7 +144,7 @@ class DictCursor(_cursor):
return
res = list()
od = {d[0]: 0 for d in desc}
od = dict((d[0], 0) for d in desc)
for d in desc:
dummy = None
idx = od[d.name]