From 23aab706d2763722309bc611a5d12d11b28d0082 Mon Sep 17 00:00:00 2001
From: Raphael Roberts <raphael.roberts48@gmail.com>
Date: Mon, 27 May 2019 15:53:36 -0500
Subject: [PATCH] Using pathlib.Path.parent instead of
 os.path.join(__fille,".."

---
 .gitignore                     |  1 +
 restscrape/scraping/browser.py | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca1d866..d7d6bba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,4 @@ nppBackup
 # HTML files for testing
 *.html
 !**/uBlock/*
+/restscrape_venv/*
diff --git a/restscrape/scraping/browser.py b/restscrape/scraping/browser.py
index adaac68..070be62 100644
--- a/restscrape/scraping/browser.py
+++ b/restscrape/scraping/browser.py
@@ -1,6 +1,7 @@
 import asyncio
 import os
 import time
+from pathlib import Path
 
 import pyppeteer
 
@@ -23,7 +24,8 @@ class Browser:
 
     def connect(self, socket_address):
         self.browser_instance = run(
-            pyppeteer.launcher.connect(browserWSEndpoint=socket_address))
+            pyppeteer.launcher.connect(browserWSEndpoint=socket_address)
+        )
         self.address = socket_address
         self.page: pyppeteer.page.Page = run(self.browser_instance.pages())[0]
         # self.page: pyppeteer.page.Page = run(b.browser_instance.newPage())
@@ -32,16 +34,16 @@ class Browser:
         opts = {}
         opts.update(self.launch_opts)
         if use_adblock:
-            adblock_path = os.path.join(__file__, "..", "uBlock")
-            opts.setdefault('args', []).extend(
+            adblock_path = Path(__file__).parent / "uBlock"
+            opts.setdefault("args", []).extend(
                 [
-                    '--disable-extensions-except='+adblock_path,
-                    '--load-extension='+adblock_path
+                    "--disable-extensions-except={}".format(adblock_path),
+                    "--load-extension={}".format(adblock_path),
                 ]
             )
         if proxy is not None:
-            opts.setdefault('args', []).extend(['--proxy-server='+proxy])
-        opts.setdefault('args', []).append('about:blank')
+            opts.setdefault("args", []).extend(["--proxy-server=" + proxy])
+        opts.setdefault("args", []).append("about:blank")
         self.browser_instance = run(pyppeteer.launch(**opts))
         self.address = self.browser_instance.wsEndpoint
         self.page: pyppeteer.page.Page = run(self.browser_instance.pages())[0]