From 158ea5a055f0f6a3b79e2ee84dc5a6df911bf1e0 Mon Sep 17 00:00:00 2001 From: Ganesh Hubale Date: Tue, 8 Oct 2024 16:07:57 +0530 Subject: [PATCH] Reformatted code using black tool Signed-off-by: Ganesh Hubale --- .pre-commit-config.yaml | 8 ++++---- pygenpass/database.py | 28 ++++++++++++++++------------ pygenpass/password.py | 6 ++---- setup.cfg | 2 +- setup.py | 4 +++- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e46f488..31cbe91 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,21 +17,21 @@ repos: verbose: true - id: check-yaml - repo: https://github.com/asottile/reorder_python_imports - rev: v1.8.0 + rev: v3.13.0 hooks: - id: reorder-python-imports name: Reorder Python Imports language_version: python3 - repo: https://github.com/psf/black - rev: 19.10b0 + rev: 24.10.0 hooks: - id: black - name: Formate with Black + name: Format with Black args: [--safe, --quiet, --line-length, "100"] language_version: python3 require_serial: true - repo: https://github.com/asottile/pyupgrade - rev: v1.25.2 + rev: v3.17.0 hooks: - id: pyupgrade name: Python Package Checks diff --git a/pygenpass/database.py b/pygenpass/database.py index 4a08bc3..ddb4e73 100644 --- a/pygenpass/database.py +++ b/pygenpass/database.py @@ -19,17 +19,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ + import sqlite3 # library for database +import sys from termcolor import colored -import sys + class DatabaseConnection: - """ Class of database entries for user's information.""" + """Class of database entries for user's information.""" def __init__(self): """Used to create database and then to connect with generated databse file - Checked for table is created? if not then created as per required values """ + Checked for table is created? if not then created as per required values""" try: self.con = sqlite3.connect("generated_password.db") self.cursor_obj = self.con.cursor() @@ -40,7 +42,7 @@ def __init__(self): """ ) self.con.commit() - except sqlite3.Error as e: + except sqlite3.Error as e: # Catch any SQLite error and print the error message print(f"Database error occurred: {e}") sys.exit(1) # Exit the program if a database error occurs @@ -50,7 +52,6 @@ def __init__(self): print(f"An error occurred: {e}") sys.exit(1) # Exit the program if an unexpected error occurs - def insert_data(self, portal_name, password, creation_date, email, portal_url): """Adding values into database""" try: @@ -63,12 +64,15 @@ def insert_data(self, portal_name, password, creation_date, email, portal_url): self.con.commit() except sqlite3.IntegrityError: print( - colored(f"Error: A record with the portal name '{portal_name}' already exists.", "green") + colored( + f"Error: A record with the portal name '{portal_name}' already exists.", + "green", + ) ) except sqlite3.Error as e: print(f"Database error occurred while inserting data: {e}") - + except Exception as e: print(f"An unexpected error occurred: {e}") @@ -99,7 +103,7 @@ def update_data(self, portal_name, password): except sqlite3.Error as e: print(f"Database error occurred while updating data: {e}") - + except Exception as e: print(f"An unexpected error occurred: {e}") @@ -118,7 +122,7 @@ def show_data(self, portal_name): return None except sqlite3.Error as e: print(f"Database error occurred while fetching data: {e}") - + except Exception as e: print(f"An unexpected error occurred: {e}") @@ -131,7 +135,7 @@ def show_all_data(self): except sqlite3.Error as e: print(f"Database error occurred while fetching all data: {e}") - + except Exception as e: print(f"An unexpected error occurred: {e}") @@ -141,9 +145,9 @@ def close_connection(self): if self.con: self.con.close() print("Database connection closed successfully.") - + except sqlite3.Error as e: print(f"Error closing the database connection: {e}") - + except Exception as e: print(f"An unexpected error occurred while closing the connection: {e}") diff --git a/pygenpass/password.py b/pygenpass/password.py index d44258c..0056dec 100644 --- a/pygenpass/password.py +++ b/pygenpass/password.py @@ -19,15 +19,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -from datetime import date import click import diceware from beautifultable import BeautifulTable from termcolor import colored +from datetime import date from pygenpass.database import DatabaseConnection + db_obj = DatabaseConnection() table = BeautifulTable() table.left_border_char = "|" @@ -53,7 +54,6 @@ def all(): db_obj.close_connection() - @click.command(help="Delete password") def delete(): """used to delete existing password""" @@ -97,7 +97,6 @@ def add(): db_obj.close_connection() - @click.command(help="Create new password") def create(): """Used for taking input from user to create password""" @@ -116,7 +115,6 @@ def create(): db_obj.close_connection() - @click.command(help="Show password") def show(): portal_name = click.prompt("Enter portal name", default="None") diff --git a/setup.cfg b/setup.cfg index 54183c7..4cc4042 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,7 @@ python_requires = >= 3.6 setup_requires = setuptools_scm install_requires = beautifultable - click + click >=8.1.0 diceware termcolor diff --git a/setup.py b/setup.py index f446046..4ca6776 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ from setuptools import setup -setup(use_scm_version=True,) +setup( + use_scm_version=True, +)