Update postgresql/clientparameters.py

mll · mll · commit 91fcd5480c72 · 2012-11-05T19:40:50.000+01:00
Alterations made to supportuse in win32 service (forced getuser() to return 'postgres')
diff --git a/postgresql/clientparameters.py b/postgresql/clientparameters.py
@@ -46,12 +46,13 @@ class ClientParameterError(Error):
 class ServiceDoesNotExistError(ClientParameterError):
 	code = '-*srv'
 
-try:
-	from getpass import getuser, getpass
-except ImportError:
-	getpass = raw_input
-	def getuser():
-		return 'postgres'
+# on win32 when program is run as windows service, getuser falls back to pwn which is not implemented
+# therefore it is better to resign from getting default username, which allows service operation
+
+getpass = raw_input
+
+def getuser():
+  return 'postgres'
 
 default_host = 'localhost'
 default_port = 5432
@@ -141,6 +142,9 @@ def defaults(environ = os.environ):
 		if appdata:
 			pgdata = os.path.join(appdata, pg_appdata_directory)
 			pgpassfile = os.path.join(pgdata, pg_appdata_passfile)
+                else:
+                        pgdata = ''
+                        pgpassfile = ''
 	else:
 		pgpassfile = os.path.join(userdir, pg_home_passfile)
 
