Fix python-postgres#91: pgpassfile is not defined at w32 because APPD…

…ATA is not defined
sqlobject · Aug 23, 2017 · acea988 · acea988
1 parent 7d7706e
commit acea988
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/postgresql/clientparameters.py b/postgresql/clientparameters.py
@@ -147,6 +147,8 @@ def defaults(environ = os.environ):
 		if appdata:
 			pgdata = os.path.join(appdata, pg_appdata_directory)
 			pgpassfile = os.path.join(pgdata, pg_appdata_passfile)
+		else:
+			pgpassfile = None
 	else:
 		pgpassfile = os.path.join(userdir, pg_home_passfile)
 
@@ -157,7 +159,7 @@ def defaults(environ = os.environ):
 		('sslrootcrlfile', os.path.join(pgdata, 'root.crl')),
 		('pgpassfile', pgpassfile),
 	):
-		if os.path.exists(v):
+		if v and os.path.exists(v):
 			yield (k,), v
 
 def envvars(environ = os.environ, modifier : "environment variable key modifier" = 'PG'.__add__):