lukhed-basic-utils 1.6.0__tar.gz → 1.6.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/PKG-INFO +1 -1
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/githubCommon.py +4 -2
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/sqlCommon.py +12 -2
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/PKG-INFO +1 -1
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/setup.py +1 -1
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/LICENSE +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/README.md +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/__init__.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/chartJsCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/classCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/fileCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/listWorkCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/mathCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibBarCharts.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibBasics.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibFormatting.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibLineCharts.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibPieCharts.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibScatter.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibSpecial.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/osCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/requestsCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/stringCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/timeCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/SOURCES.txt +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/dependency_links.txt +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/requires.txt +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/top_level.txt +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/setup.cfg +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/tests/test_osCommon.py +0 -0
- {lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/tests/test_timeCommon.py +0 -0
|
@@ -617,7 +617,6 @@ class KeyManager(GithubHelper):
|
|
|
617
617
|
self._guided_api_key_setup()
|
|
618
618
|
|
|
619
619
|
self.get_key_data()
|
|
620
|
-
print(f"{self.key_name} data retrieved successfully")
|
|
621
620
|
|
|
622
621
|
def _check_load_config_from_github(self):
|
|
623
622
|
if self.file_exists(self.key_file_name):
|
|
@@ -717,7 +716,10 @@ class KeyManager(GithubHelper):
|
|
|
717
716
|
if self._config_type == 'github':
|
|
718
717
|
self.key_data = self.retrieve_file_content([self.key_file_name])
|
|
719
718
|
elif self._config_type == 'local':
|
|
720
|
-
|
|
719
|
+
try:
|
|
720
|
+
self.key_data = fC.load_json_from_file(self._local_key_storage)
|
|
721
|
+
except Exception as e:
|
|
722
|
+
self.key_data = None
|
|
721
723
|
else:
|
|
722
724
|
print(f"ERROR: '{self._config_type}' is not a valid config_file_preference")
|
|
723
725
|
quit()
|
|
@@ -113,8 +113,8 @@ class SqlHelper(classCommon.LukhedAuth):
|
|
|
113
113
|
|
|
114
114
|
def change_database(self, database_name):
|
|
115
115
|
self.close_connection()
|
|
116
|
-
self.
|
|
117
|
-
print("New database is: " + self.
|
|
116
|
+
self.database_name = database_name
|
|
117
|
+
print("New database is: " + self.database_name)
|
|
118
118
|
|
|
119
119
|
def update_auth_data(self, force_new_auth_dict=None):
|
|
120
120
|
if force_new_auth_dict is not None:
|
|
@@ -1171,14 +1171,24 @@ class SqlHelper(classCommon.LukhedAuth):
|
|
|
1171
1171
|
|
|
1172
1172
|
Returns
|
|
1173
1173
|
-------
|
|
1174
|
+
cursor
|
|
1175
|
+
For SELECT queries, returns cursor for fetching results
|
|
1174
1176
|
None
|
|
1177
|
+
For other queries
|
|
1175
1178
|
"""
|
|
1176
1179
|
self._check_connect_db()
|
|
1177
1180
|
if params is None:
|
|
1178
1181
|
self.cursor.execute(query)
|
|
1179
1182
|
else:
|
|
1180
1183
|
self.cursor.execute(query, params)
|
|
1184
|
+
|
|
1185
|
+
# For SELECT queries, return cursor for fetching results
|
|
1186
|
+
if query.strip().upper().startswith('SELECT'):
|
|
1187
|
+
return self.cursor
|
|
1188
|
+
|
|
1189
|
+
# For other queries (UPDATE, INSERT, etc), commit and return None
|
|
1181
1190
|
self.db_connection.commit()
|
|
1191
|
+
return None
|
|
1182
1192
|
|
|
1183
1193
|
|
|
1184
1194
|
###################
|
|
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
|
|
2
2
|
|
|
3
3
|
setup(
|
|
4
4
|
name="lukhed_basic_utils",
|
|
5
|
-
version="1.6.
|
|
5
|
+
version="1.6.2",
|
|
6
6
|
description="A collection of basic utility functions",
|
|
7
7
|
long_description=open("README.md").read(),
|
|
8
8
|
long_description_content_type="text/markdown",
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibBarCharts.py
RENAMED
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibBasics.py
RENAMED
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibFormatting.py
RENAMED
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibLineCharts.py
RENAMED
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibPieCharts.py
RENAMED
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibScatter.py
RENAMED
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils/matplotlibSpecial.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/requires.txt
RENAMED
|
File without changes
|
{lukhed_basic_utils-1.6.0 → lukhed_basic_utils-1.6.2}/lukhed_basic_utils.egg-info/top_level.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|