Skip to content

modify show_usage() #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zaihuaji merged 2 commits into from
Apr 2, 2025
Merged

modify show_usage() #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6959a
modify show_usage()
Apr 2, 2025
77bbafe
remove global pgdb
Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "rda_python_common"
version = "1.0.15"
version = "1.0.16"
authors = [
{ name="Zaihua Ji", email="[email protected]" },
]
Expand Down
5 changes: 0 additions & 5 deletions src/rda_python_common/PgDBI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ def set_dbname(scname = None, lnname = None, pwname = None, dbhost = None, dbpor
#
def set_scname(dbname = None, scname = None, lnname = None, pwname = None, dbhost = None, dbport = None, socket = None):

global pgdb
changed = 0

if dbname and dbname != PGDBI['DBNAME']:
Expand Down Expand Up @@ -274,7 +273,6 @@ def set_scname(dbname = None, scname = None, lnname = None, pwname = None, dbhos
def starttran():

global curtran
global pgdb

if curtran == 1: endtran() # try to end previous transaction
if not pgdb:
Expand All @@ -296,7 +294,6 @@ def starttran():
def endtran(autocommit = True):

global curtran
global pgdb
if curtran and pgdb:
if not pgdb.closed: pgdb.commit()
pgdb.autocommit = autocommit
Expand All @@ -308,7 +305,6 @@ def endtran(autocommit = True):
def aborttran(autocommit = True):

global curtran
global pgdb
if curtran and pgdb:
if not pgdb.closed: pgdb.rollback()
pgdb.autocommit = autocommit
Expand Down Expand Up @@ -535,7 +531,6 @@ def pgconnect(reconnect = 0, pgcnt = 0, autocommit = True):
#
def pgcursor():

global pgdb
pgcur = None

if not pgdb:
Expand Down
2 changes: 1 addition & 1 deletion src/rda_python_common/PgLOG.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ def set_help_path(progfile):
#
def show_usage(progname, opts = None):

if PGLOG['PUSGDIR'] is None: set_help_path(get_caller_file())
if PGLOG['PUSGDIR'] is None: set_help_path(get_caller_file(1))
usgname = join_paths(PGLOG['PUSGDIR'], progname + '.usg')

if opts:
Expand Down