Skip to content

Commit e6ebefb

Browse files
committed
修复import错误,修复EXCEL工具类必须要文件目录的异常
1 parent 03e9902 commit e6ebefb

File tree

10 files changed

+21
-9
lines changed

10 files changed

+21
-9
lines changed

src/PaperCrawlerUtil/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
sys.path.append(str(pathlib.Path(__file__).parent))
66
__all__ = ["common_util", "crawler_util", "document_util", "office_util", "pdf_util"]
77

8+
from PaperCrawlerUtil.common_util import basic_config
9+
basic_config()

src/PaperCrawlerUtil/common_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import sys
33
from typing import List
44

5-
import PaperCrawlerUtil.global_val
5+
import PaperCrawlerUtil.global_val as global_val
66
from proxypool.storages.proxy_dict import ProxyDict
77

88
sys.path.append("PaperCrawlerUtil")

src/PaperCrawlerUtil/office_util.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ def __init__(self, filename: str = "", sheet_index: int = 0, sheet_name: str = N
117117
if sheet_name is not None else self.excel.sheet_by_index(sheet_index)
118118
self.row_size = self.sheet.nrows
119119
self.col_size = self.sheet.ncols
120+
else:
121+
self.excel = None
122+
self.sheet_names = []
123+
self.sheet = None
124+
self.row_size = 0
125+
self.col_size = 0
120126

121127
def modify(self, sheet_index: int = None, sheet_name: str = None, file_name:str = None):
122128
"""
@@ -218,6 +224,10 @@ def write_excel(self, content: List[List[object]], path: str, book_name: str = "
218224
workbook.save(path)
219225

220226
def __del__(self):
221-
self.excel.release_resources()
227+
if self.excel is not None:
228+
self.excel.release_resources()
222229

223230

231+
if __name__ == "__main__":
232+
excel = ExcelProcess()
233+
excel.write_excel([[1, 2], [3, 4]], local_path_generate("", suffix=".xls"))

src/PaperCrawlerUtil/proxypool/crawlers/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import requests
33
from loguru import logger
44
from constant import *
5-
import PaperCrawlerUtil.global_val
5+
import PaperCrawlerUtil.global_val as global_val
66
from fake_headers import Headers
77
import time
88

src/PaperCrawlerUtil/proxypool/processors/getter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from loguru import logger
22

3-
import PaperCrawlerUtil.global_val
3+
import PaperCrawlerUtil.global_val as global_val
44
from proxypool.storages.redis import RedisClient
55
from proxypool.crawlers import __all__ as crawlers_cls
66
from proxypool.storages.proxy_dict import ProxyDict

src/PaperCrawlerUtil/proxypool/processors/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from flask import Flask, g
22

3-
import PaperCrawlerUtil.global_val
3+
import PaperCrawlerUtil.global_val as global_val
44
from proxypool.exceptions import PoolEmptyException
55
from proxypool.storages.redis import RedisClient
66
from global_val import *

src/PaperCrawlerUtil/proxypool/processors/tester.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import aiohttp
55
from loguru import logger
66

7-
import PaperCrawlerUtil.global_val
7+
import PaperCrawlerUtil.global_val as global_val
88
from proxypool.schemas import Proxy
99
from proxypool.storages.redis import RedisClient
1010
from aiohttp import ClientProxyConnectionError, ServerDisconnectedError, ClientOSError, ClientHttpProxyError

src/PaperCrawlerUtil/proxypool/scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import multiprocessing
33
import sys
44

5-
import PaperCrawlerUtil.global_val
5+
import PaperCrawlerUtil.global_val as global_val
66

77
sys.path.append("../../PaperCrawlerUtil")
88
from proxypool.processors.server import app

src/PaperCrawlerUtil/proxypool/storages/proxy_dict.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from loguru import logger
1616
from proxypool.utils.proxy import is_valid_proxy, convert_proxy_or_proxies
1717
from global_val import *
18-
import PaperCrawlerUtil.global_val
18+
import PaperCrawlerUtil.global_val as global_val
1919
from constant import *
2020

2121

src/PaperCrawlerUtil/proxypool/storages/redis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import redis
22

3-
import PaperCrawlerUtil.global_val
3+
import PaperCrawlerUtil.global_val as global_val
44
from proxypool.exceptions import PoolEmptyException
55
from proxypool.schemas import Proxy
66
from random import choice

0 commit comments

Comments
 (0)