NotificationsYou must be signed in to change notification settings
Fork37
Star150

Commitcf03ee2

committed

simplified enums NodeStatus and IsolationLevel

1 parent5878552 commitcf03ee2Copy full SHA for cf03ee2

File tree

2 files changed

+13

-28

lines changed

testgres
- connection.py
- node.py

2 files changed

+13

-28

lines changed

`‎testgres/connection.py‎`

Lines changed: 10 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,10 @@ class IsolationLevel(Enum):`
`27`	`27`	`Transaction isolation level for NodeConnection`
`28`	`28`	`"""`
`29`	`29`
`30`		`-ReadUncommitted,ReadCommitted,RepeatableRead,Serializable=range(4)`
	`30`	`+ReadUncommitted='read uncommitted'`
	`31`	`+ReadCommitted='read committed'`
	`32`	`+RepeatableRead='repeatable read'`
	`33`	`+Serializable='serializable'`
`31`	`34`
`32`	`35`
`33`	`36`	`classNodeConnection(object):`
`@@ -71,39 +74,21 @@ def __exit__(self, type, value, traceback):`
`71`	`74`	`self.close()`
`72`	`75`
`73`	`76`	`defbegin(self,isolation_level=IsolationLevel.ReadCommitted):`
`74`		`-# yapf: disable`
`75`		`-levels= [`
`76`		`-'read uncommitted',`
`77`		`-'read committed',`
`78`		`-'repeatable read',`
`79`		`-'serializable'`
`80`		`- ]`
`81`		`-`
`82`		`-# Check if level is an IsolationLevel`
`83`		`-if (isinstance(isolation_level,IsolationLevel)):`
`84`		`-`
`85`		`-# Get index of isolation level`
`86`		`-level_idx=isolation_level.value`
`87`		`-assertlevel_idxinrange(4)`
`88`		`-`
`89`		`-# Replace isolation level with its name`
`90`		`-isolation_level=levels[level_idx]`
`91`		`-`
`92`		`-else:`
	`77`	`+# Check if level isn't an IsolationLevel`
	`78`	`+ifnotisinstance(isolation_level,IsolationLevel):`
`93`	`79`	`# Get name of isolation level`
`94`	`80`	`level_str=str(isolation_level).lower()`
`95`	`81`
`96`	`82`	`# Validate level string`
`97`		`-iflevel_strnotinlevels:`
	`83`	`+try:`
	`84`	`+isolation_level=IsolationLevel(level_str)`
	`85`	`+exceptValueError:`
`98`	`86`	`error='Invalid isolation level "{}"'`
`99`	`87`	`raiseQueryException(error.format(level_str))`
`100`	`88`
`101`		`-# Replace isolation level with its name`
`102`		`-isolation_level=level_str`
`103`		`-`
`104`	`89`	`# Set isolation level`
`105`	`90`	`cmd='SET TRANSACTION ISOLATION LEVEL {}'`
`106`		`-self.cursor.execute(cmd.format(isolation_level))`
	`91`	`+self.cursor.execute(cmd.format(isolation_level.value))`
`107`	`92`
`108`	`93`	`returnself`
`109`	`94`

`‎testgres/node.py‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`importtempfile`
`9`	`9`	`importtime`
`10`	`10`
`11`		`-fromenumimportEnum`
	`11`	`+fromenumimportIntEnum`
`12`	`12`	`fromsiximportraise_from`
`13`	`13`
`14`	`14`	`from .cacheimportcached_initdb`
`@@ -53,7 +53,7 @@`
`53`	`53`	`positional_args_hack`
`54`	`54`
`55`	`55`
`56`		`-classNodeStatus(Enum):`
	`56`	`+classNodeStatus(IntEnum):`
`57`	`57`	`"""`
`58`	`58`	`Status of a PostgresNode`
`59`	`59`	`"""`
`@@ -62,7 +62,7 @@ class NodeStatus(Enum):`
`62`	`62`
`63`	`63`	`# for Python 3.x`
`64`	`64`	`def__bool__(self):`
`65`		`-returnself.value==NodeStatus.Running.value`
	`65`	`+returnself==NodeStatus.Running`
`66`	`66`
`67`	`67`	`# for Python 2.x`
`68`	`68`	`__nonzero__=__bool__`

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!

Commitcf03ee2

File tree

2 files changed

2 files changed

`‎testgres/connection.py‎`

`‎testgres/node.py‎`

0 commit comments