NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commit8430468

committed

remove all kinds of mangling

1 parentac75f15 commit8430468Copy full SHA for 8430468

File tree

4 files changed

+78

-77

lines changed

testgres

4 files changed

+78

-77

lines changed

`‎testgres/backup.py`

Lines changed: 15 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,17 @@`
`7`	`7`	`fromsiximportraise_from`
`8`	`8`
`9`	`9`	`from .constsimport \`
`10`		`-DATA_DIRas_DATA_DIR, \`
`11`		`-PG_CONF_FILEas_PG_CONF_FILE, \`
`12`		`-BACKUP_LOG_FILEas_BACKUP_LOG_FILE, \`
`13`		`-DEFAULT_XLOG_METHODas_DEFAULT_XLOG_METHOD`
	`10`	`+DATA_DIR, \`
	`11`	`+PG_CONF_FILE, \`
	`12`	`+BACKUP_LOG_FILE, \`
	`13`	`+DEFAULT_XLOG_METHOD`
`14`	`14`
`15`	`15`	`from .exceptionsimportBackupException`
`16`	`16`
`17`	`17`	`from .utilsimport \`
`18`	`18`	`get_bin_path, \`
`19`		`-default_usernameas_default_username, \`
`20`		`-execute_utilityas_execute_utility`
	`19`	`+default_username, \`
	`20`	`+execute_utility`
`21`	`21`
`22`	`22`
`23`	`23`	`classNodeBackup(object):`
`@@ -27,13 +27,13 @@ class NodeBackup(object):`
`27`	`27`
`28`	`28`	`@property`
`29`	`29`	`deflog_file(self):`
`30`		`-returnos.path.join(self.base_dir,_BACKUP_LOG_FILE)`
	`30`	`+returnos.path.join(self.base_dir,BACKUP_LOG_FILE)`
`31`	`31`
`32`	`32`	`def__init__(self,`
`33`	`33`	`node,`
`34`	`34`	`base_dir=None,`
`35`	`35`	`username=None,`
`36`		`-xlog_method=_DEFAULT_XLOG_METHOD):`
	`36`	`+xlog_method=DEFAULT_XLOG_METHOD):`
`37`	`37`	`"""`
`38`	`38`	`Create a new backup.`
`39`	`39`
`@@ -48,7 +48,7 @@ def __init__(self,`
`48`	`48`	`raiseBackupException('Node must be running')`
`49`	`49`
`50`	`50`	`# Set default arguments`
`51`		`-username=usernameor_default_username()`
	`51`	`+username=usernameordefault_username()`
`52`	`52`	`base_dir=base_dirortempfile.mkdtemp()`
`53`	`53`
`54`	`54`	`# public`
`@@ -59,7 +59,7 @@ def __init__(self,`
`59`	`59`	`# private`
`60`	`60`	`self._available=True`
`61`	`61`
`62`		`-data_dir=os.path.join(self.base_dir,_DATA_DIR)`
	`62`	`+data_dir=os.path.join(self.base_dir,DATA_DIR)`
`63`	`63`
`64`	`64`	`# yapf: disable`
`65`	`65`	`_params= [`
`@@ -70,7 +70,7 @@ def __init__(self,`
`70`	`70`	`"-D",data_dir,`
`71`	`71`	`"-X",xlog_method`
`72`	`72`	`]`
`73`		`-_execute_utility(_params,self.log_file)`
	`73`	`+execute_utility(_params,self.log_file)`
`74`	`74`
`75`	`75`	`def__enter__(self):`
`76`	`76`	`returnself`
`@@ -98,8 +98,8 @@ def _prepare_dir(self, destroy):`
`98`	`98`	`ifavailable:`
`99`	`99`	`dest_base_dir=tempfile.mkdtemp()`
`100`	`100`
`101`		`-data1=os.path.join(self.base_dir,_DATA_DIR)`
`102`		`-data2=os.path.join(dest_base_dir,_DATA_DIR)`
	`101`	`+data1=os.path.join(self.base_dir,DATA_DIR)`
	`102`	`+data2=os.path.join(dest_base_dir,DATA_DIR)`
`103`	`103`
`104`	`104`	`try:`
`105`	`105`	`# Copy backup to new data dir`
`@@ -140,8 +140,8 @@ def spawn_primary(self, name=None, destroy=True, use_logging=False):`
`140`	`140`	`# New nodes should always remove dir tree`
`141`	`141`	`node._should_rm_dirs=True`
`142`	`142`
`143`		`-node.append_conf(_PG_CONF_FILE,"\n")`
`144`		`-node.append_conf(_PG_CONF_FILE,"port = {}".format(node.port))`
	`143`	`+node.append_conf(PG_CONF_FILE,"\n")`
	`144`	`+node.append_conf(PG_CONF_FILE,"port = {}".format(node.port))`
`145`	`145`
`146`	`146`	`returnnode`
`147`	`147`

`‎testgres/cache.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`from .utilsimport \`
`17`	`17`	`get_bin_path, \`
`18`		`-execute_utilityas_execute_utility`
	`18`	`+execute_utility`
`19`	`19`
`20`	`20`
`21`	`21`	`defcached_initdb(data_dir,initdb_logfile,initdb_params=[]):`
`@@ -26,7 +26,7 @@ def cached_initdb(data_dir, initdb_logfile, initdb_params=[]):`
`26`	`26`	`defcall_initdb(initdb_dir):`
`27`	`27`	`try:`
`28`	`28`	`_params= [get_bin_path("initdb"),"-D",initdb_dir,"-N"]`
`29`		`-_execute_utility(_params+initdb_params,initdb_logfile)`
	`29`	`+execute_utility(_params+initdb_params,initdb_logfile)`
`30`	`30`	`exceptExecUtilExceptionase:`
`31`	`31`	`raise_from(InitNodeException("Failed to run initdb"),e)`
`32`	`32`

`‎testgres/connection.py`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@`
`14`	`14`	`from .exceptionsimportQueryException`
`15`	`15`
`16`	`16`	`from .utilsimport \`
`17`		`-default_dbnameas_default_dbname, \`
`18`		`-default_usernameas_default_username`
	`17`	`+default_dbname, \`
	`18`	`+default_username`
	`19`	`+`
`19`	`20`
`20`	`21`	`# export these exceptions`
`21`	`22`	`InternalError=pglib.InternalError`
`@@ -37,9 +38,9 @@ class NodeConnection(object):`
`37`	`38`
`38`	`39`	`def__init__(self,node,dbname=None,username=None,password=None):`
`39`	`40`
`40`		`-#Use defaultuser if not specified`
`41`		`-dbname=dbnameor_default_dbname()`
`42`		`-username=usernameor_default_username()`
	`41`	`+#Set defaultarguments`
	`42`	`+dbname=dbnameordefault_dbname()`
	`43`	`+username=usernameordefault_username()`
`43`	`44`
`44`	`45`	`self._node=node`
`45`	`46`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8430468

File tree

4 files changed

4 files changed

`‎testgres/backup.py`

`‎testgres/cache.py`

`‎testgres/connection.py`

0 commit comments