Rename pgpass to pgpassfile.

James William Pye · James William Pye · commit c1d9f73e6208 · 2009-01-24T07:45:23.000-07:00
diff --git a/postgresql/clientparams.py b/postgresql/clientparams.py
@@ -11,7 +11,7 @@
 """
 import sys
 import os
-import postgresql.pgpass as pgpass
+from . import pgpassfile as pgpass
 
 try:
 	from getpass import getuser, getpass
diff --git a/postgresql/pgpassfile.py b/postgresql/pgpassfile.py
diff --git a/postgresql/test/test_pgpass.py b/postgresql/test/test_pgpass.py
@@ -3,8 +3,8 @@
 # http://python.projects.postgresql.org
 ##
 import unittest
-import postgresql.pgpass as client_pgpass
-from StringIO import StringIO
+from .. import pgpass as client_pgpass
+from io import StringIO
 
 passfile_sample = """
 host:1111:dbname:user:password1
@@ -47,7 +47,7 @@ def runTest(self):
 		sample1 = client_pgpass.parse(StringIO(passfile_sample))
 		sample2 = client_pgpass.parse(StringIO(difficult_passfile_sample))
 
-		for k, pw in passfile_sample_map.iteritems():
+		for k, pw in passfile_sample_map.items():
 			lpw = client_pgpass.lookup_password(sample1, k)
 			self.failUnless(lpw == pw,
 				"password lookup incongruity, expecting %r got %r with %r"
@@ -56,7 +56,7 @@ def runTest(self):
 				)
 			)
 
-		for k, pw in difficult_passfile_sample_map.iteritems():
+		for k, pw in difficult_passfile_sample_map.items():
 			lpw = client_pgpass.lookup_password(sample2, k)
 			self.failUnless(lpw == pw,
 				"password lookup incongruity, expecting %r got %r with %r"
