Skip to content

Commit 6170315

Browse files
fix
1 parent 4336fa3 commit 6170315

File tree

10 files changed

+20
-44
lines changed

10 files changed

+20
-44
lines changed

ForgejoRepoAPI.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,9 @@
44
import isodate
55
from pyforgejo import PyforgejoApi
66

7-
from interface_wrapper import (
8-
Branch,
9-
Comment,
10-
Commit,
11-
Contributor,
12-
Invite,
13-
IRepositoryAPI,
14-
Issue,
15-
PullRequest,
16-
Repository,
17-
User,
18-
WikiPage,
19-
logging,
20-
)
7+
from interface_wrapper import (Branch, Comment, Commit, Contributor, Invite,
8+
IRepositoryAPI, Issue, PullRequest, Repository,
9+
User, WikiPage, logging)
2110

2211

2312
class ForgejoRepoAPI(IRepositoryAPI):

GitHubRepoAPI.py

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
from interface_wrapper import (
2-
Branch,
3-
Comment,
4-
Commit,
5-
Contributor,
6-
Invite,
7-
IRepositoryAPI,
8-
Issue,
9-
PullRequest,
10-
Repository,
11-
User,
12-
WikiPage,
13-
logging,
14-
)
15-
161
from github import Github, GithubException
172

3+
from interface_wrapper import (Branch, Comment, Commit, Contributor, Invite,
4+
IRepositoryAPI, Issue, PullRequest, Repository,
5+
User, WikiPage, logging)
6+
187

198
class GitHubRepoAPI(IRepositoryAPI):
209
def __init__(self, client: Github):

commits_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from dataclasses import asdict, dataclass
2+
from datetime import datetime
23
from time import sleep
34
from typing import Generator
4-
from datetime import datetime
55

66
import pytz
77

interface_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from dataclasses import dataclass
44
from datetime import datetime
55

6-
from github import Github, Auth
6+
from github import Auth, Github
77
from pyforgejo import PyforgejoApi
88

99
# Настройка логирования

issues_parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import json
22
from dataclasses import asdict, dataclass
3+
from datetime import datetime
34
from time import sleep
45
from typing import Generator
5-
from datetime import datetime
66

77
import pytz
88
import requests
@@ -171,7 +171,7 @@ def log_issue_and_comments(csv_name, issue_data: IssueData, comments):
171171
if comments:
172172
for comment in comments:
173173
comment_data = IssueDataWithComment(
174-
**issue_data,
174+
**asdict(issue_data),
175175
body=comment.body,
176176
created_at=str(comment.created_at),
177177
author_name=comment.author.username,

main.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import argparse
22
import traceback
33

4-
import git_logger
5-
import export_sheets
64
import commits_parser
75
import contributors_parser
8-
import pull_requests_parser
6+
import export_sheets
7+
import git_logger
98
import invites_parser
109
import issues_parser
10+
import pull_requests_parser
1111
import wikipars
12-
1312
from utils import parse_time
1413

1514

pull_requests_parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import json
22
from dataclasses import asdict, dataclass
3+
from datetime import datetime
34
from time import sleep
45
from typing import Generator
5-
from datetime import datetime
66

77
import pytz
88
import requests
@@ -165,7 +165,7 @@ def get_info(obj, attr):
165165
if comments:
166166
for comment in comments:
167167
comment_data = PullRequestDataWithComment(
168-
**pr_data,
168+
**asdict(pr_data),
169169
body=comment.body,
170170
created_at=str(comment.created_at),
171171
author_name=comment.author.name,

test_token_usage.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import unittest
21
import argparse
32
import sys
4-
5-
from main import run
3+
import unittest
64

75
import git_logger
6+
from main import run
87

98

109
def parse_args(args):

utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import csv
22
from datetime import datetime
3+
34
import pytz
45

5-
from constants import MIN_SIDE_PADDING, SIDE_WHITE_SPACES, TITLE_LEN, TIMEZONE
6+
from constants import MIN_SIDE_PADDING, SIDE_WHITE_SPACES, TIMEZONE, TITLE_LEN
67

78

89
class logger:

wikipars.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from git import Repo, exc
55

66
from constants import WIKI_FIELDNAMES
7-
87
from utils import logger
98

109

0 commit comments

Comments
 (0)