NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commitacfc3fa

authored

Merge pull request#2 from stalkerg/master

PEP8 cleanups

2 parentsa8ae5b6 +76e21ff commitacfc3faCopy full SHA for acfc3fa

File tree

2 files changed

+40

-24

lines changed

testgres
- testgres.py
- tests
  - test_simple.py

2 files changed

+40

-24

lines changed

`‎testgres/testgres.py`

Lines changed: 36 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@`
`23`	`23`
`24`	`24`	`importos`
`25`	`25`	`importrandom`
`26`		`-importsocket`
	`26`	`+#import socket`
`27`	`27`	`importsubprocess`
`28`	`28`	`importpwd`
`29`	`29`	`importtempfile`
`30`	`30`	`importshutil`
`31`	`31`	`importtime`
`32`	`32`	`importsix`
`33`	`33`
`34`		`-# Try to use psycopg2 by default. If psycopg2 isn"t available then use`
	`34`	`+# Try to use psycopg2 by default. If psycopg2 isn"t available then use`
`35`	`35`	`# pg8000 which is slower but much more portable because uses only`
`36`	`36`	`# pure-Python code`
`37`	`37`	`try:`
`@@ -44,21 +44,28 @@`
`44`	`44`
`45`	`45`
`46`	`46`	`registered_nodes= []`
`47`		`-last_assigned_port=int(random.random()*16384)+49152;`
	`47`	`+last_assigned_port=int(random.random()*16384)+49152`
`48`	`48`	`pg_config_data= {}`
`49`	`49`
`50`	`50`
`51`		`-"""`
`52`		`-Predefined exceptions`
`53`		`-"""`
`54`		`-classClusterException(Exception):pass`
`55`		`-classQueryException(Exception):pass`
	`51`	`+classClusterException(Exception):`
	`52`	`+"""`
	`53`	`+ Predefined exceptions`
	`54`	`+ """`
	`55`	`+pass`
	`56`	`+`
	`57`	`+`
	`58`	`+classQueryException(Exception):`
	`59`	`+"""`
	`60`	`+ Predefined exceptions`
	`61`	`+ """`
	`62`	`+pass`
`56`	`63`
`57`	`64`
`58`		`-"""`
`59`		`-Transaction wrapper returned by Node`
`60`		`-"""`
`61`	`65`	`classNodeConnection(object):`
	`66`	`+"""`
	`67`	`+ Transaction wrapper returned by Node`
	`68`	`+ """`
`62`	`69`	`def__init__(self,parent_node,dbname):`
`63`	`70`	`self.parent_node=parent_node`
`64`	`71`
`@@ -78,21 +85,22 @@ def __exit__(self, type, value, tb):`
`78`	`85`	`self.connection.close()`
`79`	`86`
`80`	`87`	`defbegin(self,isolation_level=0):`
`81`		`-levels= ['read uncommitted',`
`82`		`-'read committed',`
`83`		`-'repeatable read',`
`84`		`-'serializable']`
	`88`	`+levels= ['read uncommitted',`
	`89`	`+'read committed',`
	`90`	`+'repeatable read',`
	`91`	`+'serializable']`
`85`	`92`
	`93`	`+print(type(isolation_level))`
`86`	`94`	`# Check if level is int [0..3]`
`87`		`-ifisinstance(isolation_level,int)and \`
`88`		`-isolation_levelinrange(0,4):`
	`95`	`+if(isinstance(isolation_level,int)and`
	`96`	`+isolation_levelinrange(0,4)):`
`89`	`97`
`90`	`98`	`# Replace index with isolation level type`
`91`	`99`	`isolation_level=levels[isolation_level]`
`92`	`100`
`93`	`101`	`# Or it might be a string`
`94`		`-elifisinstance(isolation_level,str)and \`
`95`		`-str.lower(isolation_level)inlevels:`
	`102`	`+elif(isinstance(isolation_level,six.text_type)and`
	`103`	`+isolation_level.lower()inlevels):`
`96`	`104`
`97`	`105`	`# Nothing to do here`
`98`	`106`	`pass`
`@@ -148,13 +156,13 @@ def error_filename(self):`
`148`	`156`
`149`	`157`	`@property`
`150`	`158`	`defconnstr(self):`
`151`		`-return"port=%s"%self.port`
	`159`	`+return"port=%s"%self.port`
`152`	`160`	`# return "port=%s host=%s" % (self.port, self.host)`
`153`	`161`
`154`	`162`	`defget_bin_path(self,filename):`
`155`	`163`	`""" Returns full path to an executable """`
`156`	`164`	`pg_config=get_config()`
`157`		`-ifnot"BINDIR"inpg_config:`
	`165`	`+if"BINDIR"notinpg_config:`
`158`	`166`	`returnfilename`
`159`	`167`	`else:`
`160`	`168`	`return"%s/%s"% (pg_config.get("BINDIR"),filename)`
`@@ -403,6 +411,7 @@ def get_username():`
`403`	`411`	`""" Returns current user name """`
`404`	`412`	`returnpwd.getpwuid(os.getuid())[0]`
`405`	`413`
	`414`	`+`
`406`	`415`	`defget_config():`
`407`	`416`	`globalpg_config_data`
`408`	`417`
`@@ -422,19 +431,22 @@ def get_config():`
`422`	`431`
`423`	`432`	`returnpg_config_data`
`424`	`433`
	`434`	`+`
`425`	`435`	`defversion_to_num(version):`
`426`	`436`	`"""Converts PostgreSQL version to number for easier comparison"""`
`427`	`437`	`importre`
`428`	`438`
`429`	`439`	`ifnotversion:`
`430`	`440`	`return0`
`431`	`441`	`parts=version.split(".")`
`432`		`-whilelen(parts)<3:parts.append("0")`
	`442`	`+whilelen(parts)<3:`
	`443`	`+parts.append("0")`
`433`	`444`	`num=0`
`434`	`445`	`forpartinparts:`
`435`	`446`	`num=num*100+int(re.sub("[^\d]","",part))`
`436`	`447`	`returnnum`
`437`	`448`
	`449`	`+`
`438`	`450`	`defget_new_node(name):`
`439`	`451`	`globalregistered_nodes`
`440`	`452`	`globallast_assigned_port`
`@@ -462,12 +474,14 @@ def get_new_node(name):`
`462`	`474`
`463`	`475`	`returnnode`
`464`	`476`
	`477`	`+`
`465`	`478`	`defclean_all():`
`466`	`479`	`globalregistered_nodes`
`467`	`480`	`fornodeinregistered_nodes:`
`468`	`481`	`node.cleanup()`
`469`	`482`	`registered_nodes= []`
`470`	`483`
	`484`	`+`
`471`	`485`	`defstop_all():`
`472`	`486`	`globalregistered_nodes`
`473`	`487`	`fornodeinregistered_nodes:`

`‎testgres/tests/test_simple.py`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`importunittest`
`2`		`-importtime`
`3`		`-fromtestgresimportget_new_node,clean_all,stop_all`
	`2`	`+# import time`
	`3`	`+# from testgres import clean_all`
	`4`	`+fromtestgresimportget_new_node,stop_all`
	`5`	`+`
`4`	`6`
`5`	`7`	`classSimpleTest(unittest.TestCase):`
`6`	`8`

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!

Commitacfc3fa

File tree

2 files changed

2 files changed

`‎testgres/testgres.py`

`‎testgres/tests/test_simple.py`

0 commit comments