style: set max line length to 120

Signed-off-by: Jack Cherng <[email protected]>
nthu-ee · Oct 7, 2020 · 1decb05 · 1decb05
1 parent 2569013
commit 1decb05
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 43 deletions.
diff --git a/caac_package/Crawler.py b/caac_package/Crawler.py
@@ -76,9 +76,7 @@ def fetchAndSaveDepartmentLists(self, filepaths):
         departmentApplys = []
 
         def workerFetchPage(filepath):
-            content = self.fetchAndSavePage(
-                self.projectBaseUrl + filepath, overwrite=False, log=True
-            )
+            content = self.fetchAndSavePage(self.projectBaseUrl + filepath, overwrite=False, log=True)
             links = pq(content)("a")
             for link in links.items():
                 href = link.attr("href")
@@ -257,9 +255,7 @@ def getPage(self, url):
         while True:
             # try to get page content
             try:
-                scraper = cloudscraper.create_scraper(
-                    delay=None, interpreter="js2py", allow_brotli=True, debug=False
-                )
+                scraper = cloudscraper.create_scraper(delay=None, interpreter="js2py", allow_brotli=True, debug=False)
 
                 return scraper.get(url).content.decode("utf-8")
             # somehow we cannot get the page content

diff --git a/caac_package/LookupDb.py b/caac_package/LookupDb.py
@@ -121,9 +121,7 @@ def writeOutSieveResult(self, outputFile, lookupResult, args):
 
                 for departmentId in departmentIds:
                     universityId = departmentId[:3]
-                    applieds.append(
-                        f"{self.universityMap[universityId]}\n{self.departmentMap[departmentId]}"
-                    )
+                    applieds.append(f"{self.universityMap[universityId]}\n{self.departmentMap[departmentId]}")
 
                 # fmt: off
                 worksheet.write_row(
@@ -197,9 +195,7 @@ def writeOutEntranceResult(self, outputFile, lookupResult, args):
 
                 for departmentId in departmentIds:
                     universityId = departmentId[:3]
-                    applieds.append(
-                        f"{self.universityMap[universityId]}\n{self.departmentMap[departmentId]}"
-                    )
+                    applieds.append(f"{self.universityMap[universityId]}\n{self.departmentMap[departmentId]}")
 
                 # fmt: off
                 worksheet.write_row(

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.black]
-line-length = 100
+line-length = 120
 target-version = ['py38']
 
 # regex

diff --git a/第一階段-篩選結果（甄選委員會）/lookup.py b/第一階段-篩選結果（甄選委員會）/lookup.py
@@ -18,14 +18,10 @@
     help="The year of data to be processed. (ex: 2017 or 106 is the same)",
 )
 parser.add_argument(
-    "--admissionIds",
-    default="",
-    help="Admission IDs that are going to be looked up. (separate by commas)",
+    "--admissionIds", default="", help="Admission IDs that are going to be looked up. (separate by commas)",
 )
 parser.add_argument(
-    "--departmentIds",
-    default="",
-    help="Department IDs that are going to be looked up. (separate by commas)",
+    "--departmentIds", default="", help="Department IDs that are going to be looked up. (separate by commas)",
 )
 parser.add_argument(
     "--output",
@@ -36,9 +32,7 @@
 args = parser.parse_args()
 
 year = Year.taiwanize(args.year)
-resultFilepath = (
-    args.output if os.path.splitext(args.output)[1].lower() == ".xlsx" else f"{args.output}.xlsx"
-)
+resultFilepath = args.output if os.path.splitext(args.output)[1].lower() == ".xlsx" else f"{args.output}.xlsx"
 dbFilepath = ProjectConfig.getCrawledDbFile(year, "apply_sieve")
 
 # variables

diff --git a/第二階段-交叉查榜/cross.py b/第二階段-交叉查榜/cross.py
@@ -29,9 +29,7 @@
 args = parser.parse_args()
 
 year = Year.taiwanize(args.year)
-resultFilepath = (
-    args.output if os.path.splitext(args.output)[1].lower() == ".xlsx" else args.output + ".xlsx"
-)
+resultFilepath = args.output if os.path.splitext(args.output)[1].lower() == ".xlsx" else args.output + ".xlsx"
 
 # variables
 crossResults = {
@@ -72,9 +70,7 @@ def nthuSort(department):
     if departmentId.startswith("_"):
         return departmentId
 
-    universityName, departmentName = splitUniversityNameAndDepartmentName(
-        personResult[departmentId]["_name"]
-    )
+    universityName, departmentName = splitUniversityNameAndDepartmentName(personResult[departmentId]["_name"])
 
     # 清華大學 be the later one
     if "清華大學" in universityName:
@@ -211,9 +207,7 @@ async def puppetFetchCrossUrls(urls):
     ]
 
     if departmentNameDispatched:
-        universityName, departmentName = splitUniversityNameAndDepartmentName(
-            departmentNameDispatched[0]
-        )
+        universityName, departmentName = splitUniversityNameAndDepartmentName(departmentNameDispatched[0])
         departmentNameDispatched = f"{universityName}\n{departmentName}"
     else:
         departmentNameDispatched = ""
@@ -234,9 +228,7 @@ async def puppetFetchCrossUrls(urls):
         if departmentId.startswith("_"):
             continue
 
-        universityName, departmentName = splitUniversityNameAndDepartmentName(
-            personResult[departmentId]["_name"]
-        )
+        universityName, departmentName = splitUniversityNameAndDepartmentName(personResult[departmentId]["_name"])
 
         departmentResult = personResult[departmentId]
 

diff --git a/第二階段-分發結果（甄選委員會）/lookup.py b/第二階段-分發結果（甄選委員會）/lookup.py
@@ -18,14 +18,10 @@
     help="The year of data to be processed. (ex: 2017 or 106 is the same)",
 )
 parser.add_argument(
-    "--admissionIds",
-    default="",
-    help="Admission IDs that are going to be looked up. (separate by commas)",
+    "--admissionIds", default="", help="Admission IDs that are going to be looked up. (separate by commas)",
 )
 parser.add_argument(
-    "--departmentIds",
-    default="",
-    help="Department IDs that are going to be looked up. (separate by commas)",
+    "--departmentIds", default="", help="Department IDs that are going to be looked up. (separate by commas)",
 )
 parser.add_argument(
     "--output",
@@ -36,9 +32,7 @@
 args = parser.parse_args()
 
 year = Year.taiwanize(args.year)
-resultFilepath = (
-    args.output if os.path.splitext(args.output)[1].lower() == ".xlsx" else f"{args.output}.xlsx"
-)
+resultFilepath = args.output if os.path.splitext(args.output)[1].lower() == ".xlsx" else f"{args.output}.xlsx"
 dbFilepath = ProjectConfig.getCrawledDbFile(year, "apply_entrance")
 
 # variables