Code formated using black (#144)

Author: ganeshhubale

.travis.yml

@@ -2,13 +2,22 @@ language: python
 python:
   - "3.4"
   - "3.5"
-  - "3.6"
 before_install:  
   - pip install --upgrade pip
+matrix:
+        include:
+                - python: '3.6' # Black requires Python 3.6+
+                  install:
+                          - pip install -r requirements.txt
+                          - pip install black
+                  script:
+                          - black --check readit setup.py
+                          - python setup.py install
+                          - python setup.py check -r -s
+                          - pytest
 install:
   - pip install -r requirements.txt
 script:
-  - flake8 --ignore=F403,F405,F841,E127,E126,E128,W291,E501 readit setup.py
   - python setup.py install
   - python setup.py check -r -s
   - pytest

readit/__init__.py

@@ -18,7 +18,7 @@
 
 from readit.cli import main
 
-if __name__ == '__main__':
+if __name__ == "__main__":
 
     """
     This is initial function.

readit/database.py

@@ -28,15 +28,15 @@
 
 table = BeautifulTable()
 table_tag = BeautifulTable()
-table.left_border_char = '|'
-table.right_border_char = '|'
-table.top_border_char = '='
-table.header_separator_char = '='
+table.left_border_char = "|"
+table.right_border_char = "|"
+table.top_border_char = "="
+table.header_separator_char = "="
 table.column_headers = ["ID", "URL", "TAG", "DATE", "TIME"]
-table_tag.left_border_char = '|'
-table_tag.right_border_char = '|'
-table_tag.top_border_char = '='
-table_tag.header_separator_char = '='
+table_tag.left_border_char = "|"
+table_tag.right_border_char = "|"
+table_tag.top_border_char = "="
+table_tag.header_separator_char = "="
 table_tag.column_headers = ["Available TAGs"]
 
 
@@ -64,20 +64,21 @@ def init_db(self, cursor, db):
         """
 
         try:
-            config_path = os.path.join(
-                os.path.expanduser('~'), ".config/readit")
+            config_path = os.path.join(os.path.expanduser("~"), ".config/readit")
             if not os.path.exists(config_path):
                 os.mkdir(config_path)
         except OSError:
-            print('Error: Creating directory.' + config_path)
+            print("Error: Creating directory." + config_path)
 
         databasefile = os.path.join(config_path, "bookmarks.db")
         try:
             self.db = sqlite3.connect(databasefile)
             self.cursor = self.db.cursor()
-            self.cursor.execute('''CREATE TABLE IF NOT EXISTS bookmarks
+            self.cursor.execute(
+                """CREATE TABLE IF NOT EXISTS bookmarks
             (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-            url TEXT UNIQUE NOT NULL, tags TEXT, date TEXT, time TEXT)''')
+            url TEXT UNIQUE NOT NULL, tags TEXT, date TEXT, time TEXT)"""
+            )
             self.db.commit()
 
         except sqlite3.OperationalError:
@@ -104,9 +105,12 @@ def add_url(self, url):
             global date
             start = datetime.datetime.now()
             time = start.strftime("%H:%M:%S")
-            self.cursor.execute('''
+            self.cursor.execute(
+                """
             INSERT INTO bookmarks(url, tags, date, time) VALUES (?, ?, ?, ?)
-            ''', (self.url, "None", date, time))
+            """,
+                (self.url, "None", date, time),
+            )
             self.db.commit()
             return True
         except Exception as e1:
@@ -136,12 +140,14 @@ def tag_url(self, tag_name, tagged_url):
             start = datetime.datetime.now()
             time = start.strftime("%H:%M:%S")
             self.cursor.execute(
-                '''INSERT INTO bookmarks(url, tags, date, time)
-                VALUES(?, ?, ?, ?)''', (self.url, self.tag, date, time))
+                """INSERT INTO bookmarks(url, tags, date, time)
+                VALUES(?, ?, ?, ?)""",
+                (self.url, self.tag, date, time),
+            )
             self.db.commit()
             return True
         except Exception as t:
-            return False 
+            return False
 
     def list_all_tags(self):
         """
@@ -154,7 +160,7 @@ def list_all_tags(self):
         """
         tag_list = set()
         try:
-            self.cursor.execute('''SELECT tags FROM bookmarks''')
+            self.cursor.execute("""SELECT tags FROM bookmarks""")
             tags_in_db = self.cursor.fetchall()
             for tags_available in tags_in_db:
                 tag_list.add(tags_available)
@@ -183,10 +189,12 @@ def delete_url(self, url_id):
         try:
             self.url_id = url_id
             self.cursor.execute(
-                ''' SELECT url FROM bookmarks where id=? ''', (self.url_id,))
+                """ SELECT url FROM bookmarks where id=? """, (self.url_id,)
+            )
             deleted_url = self.cursor.fetchone()
             self.cursor.execute(
-                ''' DELETE FROM bookmarks WHERE id=? ''', (self.url_id,))
+                """ DELETE FROM bookmarks WHERE id=? """, (self.url_id,)
+            )
             self.db.commit()
             if deleted_url:
                 return True
@@ -218,10 +226,12 @@ def update_url(self, url_id, url):
             self.url_id = url_id
             self.url = url
             self.cursor.execute(
-                ''' SELECT url FROM bookmarks WHERE id=?''', (self.url_id,))
+                """ SELECT url FROM bookmarks WHERE id=?""", (self.url_id,)
+            )
             url_replaced = self.cursor.fetchone()
-            self.cursor.execute(''' UPDATE bookmarks SET url=? WHERE id=?''',
-                                                    (self.url, self.url_id,))
+            self.cursor.execute(
+                """ UPDATE bookmarks SET url=? WHERE id=?""", (self.url, self.url_id)
+            )
             self.db.commit()
             return True
         except Exception as e3:
@@ -237,8 +247,7 @@ def show_url(self):
             A table representing all bookmarks.
         """
         try:
-            self.cursor.execute(
-                ''' SELECT id, url, tags, date, time FROM bookmarks ''')
+            self.cursor.execute(""" SELECT id, url, tags, date, time FROM bookmarks """)
             all_bookmarks = self.cursor.fetchall()
             self.db.commit()
             if all_bookmarks == []:
@@ -266,8 +275,10 @@ def search_by_tag(self, tag):
         try:
             self.tag = tag
             self.cursor.execute(
-                ''' SELECT id, url, tags, date, time
-                                FROM bookmarks WHERE tags=?''', (self.tag,))
+                """ SELECT id, url, tags, date, time
+                                FROM bookmarks WHERE tags=?""",
+                (self.tag,),
+            )
             all_bookmarks = self.cursor.fetchall()
             self.db.commit
             if all_bookmarks == []:
@@ -291,7 +302,7 @@ def delete_all_url(self):
                 self.db.commit()
                 return False
             else:
-                self.cursor.execute(''' DELETE FROM bookmarks ''')
+                self.cursor.execute(""" DELETE FROM bookmarks """)
                 self.db.commit()
                 return True
         except Exception as e5:
@@ -306,8 +317,7 @@ def check_url_db(self):
         bool
             It returns TRUE if URL is present in database else False.
         """
-        self.cursor.execute(
-            ''' SELECT id, url, tags, date, time FROM bookmarks ''')
+        self.cursor.execute(""" SELECT id, url, tags, date, time FROM bookmarks """)
         all_bookmarks = self.cursor.fetchall()
         if all_bookmarks == []:
             return True
@@ -331,7 +341,8 @@ def open_url(self, urlid):
         try:
             self.urlid = urlid
             self.cursor.execute(
-                ''' SELECT url FROM bookmarks WHERE id=?''', (self.urlid,))
+                """ SELECT url FROM bookmarks WHERE id=?""", (self.urlid,)
+            )
             all_row = self.cursor.fetchone()
             for url in all_row:
                 webbrowser.open_new(url)
@@ -362,8 +373,8 @@ def export_urls(self):
             self.conn = sqlite3.connect(glob(expanduser(databasefile))[0])
             self.cursor = self.conn.cursor()
             self.cursor.execute("select * from bookmarks")
-            with open("exported_bookmarks.csv", "w", newline='') as csv_file:
-                csv_writer = csv.writer(csv_file, delimiter='\t')
+            with open("exported_bookmarks.csv", "w", newline="") as csv_file:
+                csv_writer = csv.writer(csv_file, delimiter="\t")
                 csv_writer.writerow([i[0] for i in self.cursor.description])
                 csv_writer.writerows(self.cursor)
                 dirpath = os.getcwd() + "/exported_bookmarks.csv"
@@ -388,8 +399,10 @@ def url_info(self, url):
         try:
             self.url_exist = url
             self.cursor.execute(
-                ''' SELECT id, url, tags, date, time
-                            FROM bookmarks WHERE url=?''', (self.url_exist,))
+                """ SELECT id, url, tags, date, time
+                            FROM bookmarks WHERE url=?""",
+                (self.url_exist,),
+            )
             all_bookmarks = self.cursor.fetchall()
             self.db.commit()
             return all_bookmarks

readit/view.py

@@ -19,22 +19,23 @@
 
 table = BeautifulTable()
 table_tag = BeautifulTable()
-table.left_border_char = '|'
-table.right_border_char = '|'
-table.top_border_char = '='
-table.header_separator_char = '='
+table.left_border_char = "|"
+table.right_border_char = "|"
+table.top_border_char = "="
+table.header_separator_char = "="
 table.column_headers = ["ID", "URL", "TAG", "DATE", "TIME"]
-table_tag.left_border_char = '|'
-table_tag.right_border_char = '|'
-table_tag.top_border_char = '='
-table_tag.header_separator_char = '='
+table_tag.left_border_char = "|"
+table_tag.right_border_char = "|"
+table_tag.top_border_char = "="
+table_tag.header_separator_char = "="
 table_tag.column_headers = ["Available TAGs"]
 
 
 class ShowResults(object):
     """This class includes methods. Which are used to 
         show output to the user in table format.
     """
+
     def __init__(self):
         pass
 
@@ -51,8 +52,8 @@ def print_bookmarks(self, all_bookmarks):
             print("*" * 24, "\nAlready bookmarked URLs.\n", "*" * 23)
             for bookmark in all_bookmarks:
                 table.append_row(
-                        [bookmark[0], bookmark[1], bookmark[2],
-                            bookmark[3], bookmark[4]])
+                    [bookmark[0], bookmark[1], bookmark[2], bookmark[3], bookmark[4]]
+                )
             print(table)
         else:
             print("No bookmarks found.")

setup.py

@@ -3,21 +3,12 @@
 with open("README.rst") as readme_file:
     long_description = readme_file.read()
 
-install_requires = [
-    'setuptools',
-    'requests',
-    'click',
-    'beautifultable',
-]
+install_requires = ["setuptools", "requests", "click", "beautifultable"]
 
 setup(
     name="readit",
     packages=find_packages(),
-    entry_points={
-        'console_scripts': [
-            'readit = readit.__init__:main',
-        ],
-    },
+    entry_points={"console_scripts": ["readit = readit.__init__:main"]},
     version="v0.2",
     author="Ganesh, Shital, Daivshala",
     author_email="[email protected]",
@@ -26,10 +17,10 @@
     license="GNU General Public License v3.0",
     keywords="clitool bookmark readit",
     url="https://github.com/projectreadit/readit",
-    py_modules=['readit.__init__'],
+    py_modules=["readit.__init__"],
     namespace_packages=[],
     include_package_data=True,
     zip_safe=False,
     install_requires=install_requires,
-    scripts=['test_readit.py'],
+    scripts=["test_readit.py"],
 )