@@ -203,19 +203,29 @@ def cache_pg_config_data(cmd):
203203return cache_pg_config_data ("pg_config" )
204204
205205
206- def get_pg_version ( bin_dir = None ):
206+ def get_pg_version2 ( os_ops : OsOperations , bin_dir = None ):
207207"""
208208 Return PostgreSQL version provided by postmaster.
209209 """
210+ assert os_ops is not None
211+ assert isinstance (os_ops ,OsOperations )
210212
211213# Get raw version (e.g., postgres (PostgreSQL) 9.5.7)
212- postgres_path = os .path .join (bin_dir ,'postgres' )if bin_dir else get_bin_path ( 'postgres' )
214+ postgres_path = os .path .join (bin_dir ,'postgres' )if bin_dir else get_bin_path2 ( os_ops , 'postgres' )
213215_params = [postgres_path ,'--version' ]
214- raw_ver = tconf . os_ops .exec_command (_params ,encoding = 'utf-8' )
216+ raw_ver = os_ops .exec_command (_params ,encoding = 'utf-8' )
215217
216218return parse_pg_version (raw_ver )
217219
218220
221+ def get_pg_version (bin_dir = None ):
222+ """
223+ Return PostgreSQL version provided by postmaster.
224+ """
225+
226+ return get_pg_version2 (tconf .os_ops ,bin_dir )
227+
228+
219229def parse_pg_version (version_out ):
220230# Generalize removal of system-specific suffixes (anything in parentheses)
221231raw_ver = re .sub (r'\([^)]*\)' ,'' ,version_out ).strip ()