sr-dev

sr-dev@lists.kamailio.org

8 participants
45206 discussions

git:5.2:a2660fbe: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: a2660fbe2e974553f0146c9ee84fcc6fa2f8f705 URL: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:05+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 (cherry picked from commit b722a48144ac9e029bdbc2968dedbe56966a3f7c) (cherry picked from commit c4dd3218e6b723c688762a5c4253fa70f3f588bc) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… Patch: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1]

1 0

git:5.3:e26e587f: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: e26e587f31eb23c431a2cfb149ec7a86b4f648bc URL: https://github.com/kamailio/kamailio/commit/e26e587f31eb23c431a2cfb149ec7a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:53+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 (cherry picked from commit 5f52f9905bbdf63d636080f7d0340af4f71ed12a) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/e26e587f31eb23c431a2cfb149ec7a8… Patch: https://github.com/kamailio/kamailio/commit/e26e587f31eb23c431a2cfb149ec7a8… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 7e1de04687..581496c309 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -60,6 +60,10 @@ def __init__(self, location): if not os.path.isdir(location): raise ParseError(location + ' is not a directory') + def __del__(self): + if getattr(self, 'fd', False): + self.fd.close() + def _ParseOrderBy(self): """Parse out the column name to be used for ordering the dataset. @@ -438,6 +442,8 @@ def CleanUp(self): self.command = '' # which command are we executing self.strings = [] # list of string literals parsed from the query self.parens = [] # list of parentheses parsed from the query + if getattr(self, 'fd', False): + self.fd.close() def ParseQuery(self, query): """External wrapper for the query parsing routines.

1 0

git:5.3:5a90c8bc: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: 5a90c8bc600fe9a93a5ce4f828ce50f3bf532b99 URL: https://github.com/kamailio/kamailio/commit/5a90c8bc600fe9a93a5ce4f828ce50f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:42+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 (cherry picked from commit 765efa80c7d27e9447bc1ad8a354ee24723580ef) --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/kamailio/commit/5a90c8bc600fe9a93a5ce4f828ce50f… Patch: https://github.com/kamailio/kamailio/commit/5a90c8bc600fe9a93a5ce4f828ce50f…

1 0

git:5.3:c4dd3218: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: c4dd3218e6b723c688762a5c4253fa70f3f588bc URL: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:19+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 (cherry picked from commit b722a48144ac9e029bdbc2968dedbe56966a3f7c) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… Patch: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1]

1 0

[kamailio/kamailio] [Feature Request] Python3 compatibility for dbtextdb (#1747)
by Anthony Messina 04 May '20

04 May '20

kamctl's dbtextdb.py fails to build in a Python3-only environment. Update dbtextdb to Python3. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1747

4 12

git:master:5f52f990: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 5f52f9905bbdf63d636080f7d0340af4f71ed12a URL: https://github.com/kamailio/kamailio/commit/5f52f9905bbdf63d636080f7d0340af… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T15:22:36+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/5f52f9905bbdf63d636080f7d0340af… Patch: https://github.com/kamailio/kamailio/commit/5f52f9905bbdf63d636080f7d0340af… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 7e1de04687..581496c309 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -60,6 +60,10 @@ def __init__(self, location): if not os.path.isdir(location): raise ParseError(location + ' is not a directory') + def __del__(self): + if getattr(self, 'fd', False): + self.fd.close() + def _ParseOrderBy(self): """Parse out the column name to be used for ordering the dataset. @@ -438,6 +442,8 @@ def CleanUp(self): self.command = '' # which command are we executing self.strings = [] # list of string literals parsed from the query self.parens = [] # list of parentheses parsed from the query + if getattr(self, 'fd', False): + self.fd.close() def ParseQuery(self, query): """External wrapper for the query parsing routines.

1 0

git:master:765efa80: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 765efa80c7d27e9447bc1ad8a354ee24723580ef URL: https://github.com/kamailio/kamailio/commit/765efa80c7d27e9447bc1ad8a354ee2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T15:06:43+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/kamailio/commit/765efa80c7d27e9447bc1ad8a354ee2… Patch: https://github.com/kamailio/kamailio/commit/765efa80c7d27e9447bc1ad8a354ee2…

1 0

git:master:b722a481: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: b722a48144ac9e029bdbc2968dedbe56966a3f7c URL: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T14:48:41+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… Patch: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1]

1 0

git:5.3:5f6f4331: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: 5f6f4331811e654e75b49263f8fb823bea9874a3 URL: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T12:10:05+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined (cherry picked from commit 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… Patch: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1)

1 0

git:master:1aca79c4: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9 URL: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T11:33:12+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… Patch: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev