Commitdc4b4c3

vshepard

committed

Move _get_ssl_options in separate function

1 parente729c2f commitdc4b4c3Copy full SHA for dc4b4c3

File tree

+18

-5

lines changed

+18

-5

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,16 +124,27 @@ def get_pid(self):`
`124`	`124`	`defget_process_children(self,pid):`
`125`	`125`	`raiseNotImplementedError()`
`126`	`126`
	`127`	`+def_get_ssl_options(self):`
	`128`	`+"""`
	`129`	`+ Determine the SSL options based on available modules.`
	`130`	`+ """`
	`131`	`+ifself.conn_params.skip_ssl:`
	`132`	`+if'psycopg2'insys.modules:`
	`133`	`+return {"sslmode":"disable"}`
	`134`	`+elif'pg8000'insys.modules:`
	`135`	`+return {"ssl_context":None}`
	`136`	`+return {}`
	`137`	`+`
`127`	`138`	`# Database control`
`128`	`139`	`defdb_connect(self,dbname,user,password=None,host="localhost",port=5432):`
`129`		`-ssl_options={"sslmode":"disable"}ifself.conn_params.skip_ssland'psycopg2'insys.moduleselse {}`
	`140`	`+ssl_options=self._get_ssl_options()`
`130`	`141`	`conn=pglib.connect(`
`131`	`142`	`host=host,`
`132`	`143`	`port=port,`
`133`	`144`	`database=dbname,`
`134`	`145`	`user=user,`
`135`	`146`	`password=password,`
`136`		`-**({"ssl_context":None}ifself.conn_params.skip_ssland'pg8000'insys.moduleselsessl_options)`
	`147`	`+**ssl_options`
`137`	`148`	`)`
`138`	`149`
`139`	`150`	`returnconn`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1039,9 +1039,11 @@ def test_parse_pg_version(self):`
`1039`	`1039`	`deftest_the_same_port(self):`
`1040`	`1040`	`withget_new_node()asnode:`
`1041`	`1041`	`node.init().start()`
`1042`		`-withget_new_node()asnode2:`
`1043`		`-node2.port=node.port`
`1044`		`-node2.init().start()`
	`1042`	`+withget_new_node()asnode2:`
	`1043`	`+node2.port=node.port`
	`1044`	`+# _should_free_port is true if port was set up manually`
	`1045`	`+node2._should_free_port=False`
	`1046`	`+node2.init().start()`
`1045`	`1047`
`1046`	`1048`	`deftest_make_simple_with_bin_dir(self):`
`1047`	`1049`	`withget_new_node()asnode:`

Comments

(0)