Skip to content
This repository was archived by the owner on Sep 1, 2024. It is now read-only.

Commit bc032e2

Browse files
committed
命名規則に沿って関数・モジュール名を変更
1 parent cbf4627 commit bc032e2

14 files changed

+154
-154
lines changed

Generator.py

-23
This file was deleted.

Test/AllDayTest.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import datetime
1010

1111
# Import user func
12-
from FormatCheck import timeFormatCheck
13-
from dateFormatCheck import dateFormatCheck
12+
from check_format import timeFormatCheck
13+
from check_format import dateFormatCheck
1414

1515

1616
def makeDateTime(date, time):
2.1 KB
Binary file not shown.
692 Bytes
Binary file not shown.
1.04 KB
Binary file not shown.
860 Bytes
Binary file not shown.

FormatCheck.py check_format.py

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
from operator import truediv
22
from sqlite3 import Date
3-
from datetimeMaster import *
3+
from datetime_master import *
44
from calendar import calendar, isleap
55

66

7-
def startYearFC(y):
7+
def verify_year(y):
88
try:
99
y = int(y)
1010
if len(str(y)) != 4:
1111
return False
12-
if y < int(thisYear()):
12+
if y < int(this_year()):
1313
return False
1414
return True
1515
except:
1616
return False
1717

1818

19-
def startMonthFC(y, m):
19+
def verify_month(y, m):
2020
try:
2121
y = int(y)
2222
m = int(m)
2323
# 1~12月の範囲に入っていないものははじく。
2424
if 0 >= m or 12 < m:
2525
return False
26-
if y == int(thisYear()) and m < int(thisMonth()):
26+
if y == int(this_year()) and m < int(this_month()):
2727
return False
2828
return True
2929
except:
3030
return False
3131

3232

33-
def startDateFC(y, m, d):
33+
def verify_start_date(y, m, d):
3434
thirty = [4, 6, 9, 11]
3535
thirtyone = [1, 3, 5, 7, 8, 10, 12]
3636
try:
@@ -48,18 +48,18 @@ def startDateFC(y, m, d):
4848
if m in thirtyone:
4949
if 1 > d or 31 < d:
5050
return False
51-
if y == int(thisYear()) and m == int(thisMonth()):
51+
if y == int(this_year()) and m == int(this_month()):
5252
if d < int(today()):
5353
return False
5454
return True
5555
except:
5656
return False
5757

5858

59-
def endYearFC(sy, ey):
59+
def verify_end_year(sy, ey):
6060
try:
6161
sy, ey = int(sy), int(ey)
62-
if startYearFC(ey):
62+
if verify_year(ey):
6363
if ey < sy:
6464
return False
6565
return True
@@ -69,8 +69,8 @@ def endYearFC(sy, ey):
6969
return False
7070

7171

72-
def endMonthFC(sy, ey, sm, em):
73-
if startMonthFC(ey, em):
72+
def verify_end_month(sy, ey, sm, em):
73+
if verify_month(ey, em):
7474
sy, ey, sm, em = int(sy), int(ey), int(sm), int(em)
7575
if sy == ey and sm > em:
7676
return False
@@ -79,8 +79,8 @@ def endMonthFC(sy, ey, sm, em):
7979
return False
8080

8181

82-
def endDateFC(sy, ey, sm, em, sd, ed):
83-
if startDateFC(ey, em, ed):
82+
def verify_end_date(sy, ey, sm, em, sd, ed):
83+
if verify_start_date(ey, em, ed):
8484
sy, ey, sm, em, sd, ed = int(sy), int(
8585
ey), int(sm), int(em), int(sd), int(ed)
8686
if sy == ey and sm == em and sd > ed:
@@ -91,11 +91,11 @@ def endDateFC(sy, ey, sm, em, sd, ed):
9191

9292

9393
if __name__ == '__main__':
94-
year = "2022"
95-
month = "06"
96-
date = "03"
97-
# print(startYearFC(year))
98-
# print(startMonthFC(year,month))
99-
# print(startDateFC(year, month,date))
100-
# print(endYearFC("2023","2024"))
101-
print(endMonthFC("2022", "2023", "06", "05"))
94+
year = '2022'
95+
month = '06'
96+
date = '03'
97+
# print(verify_year(year))
98+
# print(verify_month(year,month))
99+
# print(verify_start_date(year, month,date))
100+
# print(verify_end_year('2023','2024'))
101+
print(verify_end_month('2022', '2023', '06', '05'))

token_check.py check_token.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66

7-
def tExpiration_check():
7+
def check_token_expiration():
88
try:
99
# 現在日時を取得
1010
now = datetime.datetime.now()
@@ -24,5 +24,5 @@ def tExpiration_check():
2424
return
2525

2626

27-
if __name__ == "__main__":
28-
tExpiration_check()
27+
if __name__ == '__main__':
28+
check_token_expiration()

datetimeMaster.py

-33
This file was deleted.

datetime_master.py

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
2+
import datetime
3+
4+
5+
def this_year():
6+
now = str(datetime.date.today())
7+
this_year = now[0]+now[1]+now[2]+now[3]
8+
return this_year
9+
10+
11+
def this_month():
12+
now = str(datetime.date.today())
13+
this_month = now[5]+now[6]
14+
return this_month
15+
16+
17+
def today():
18+
now = str(datetime.date.today())
19+
today = now[8]+now[9]
20+
return today
21+
22+
23+
def generateDate(year, month, date):
24+
date = f'{year}-{month}-{date}'
25+
return date
26+
27+
28+
if __name__ == '__main__':
29+
print('Functions return.')
30+
print('this_year '+str(this_year()))
31+
print('this_month '+str(this_month()))
32+
print('today '+str(today()))
33+
print('generateDate '+generateDate('2000','07','10'))

generate_datetime.py

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
2+
# def generateDateTimeFromUserImput(year, month, date, hour, minute):
3+
def generate_datetime(year, month, date, hour, minute):
4+
# Goal generate yyyy-mm-ddThh:mm:ss(ss = 00)
5+
datetime = f'{year}-{month}-{date}T{hour}:{minute}:00'
6+
return datetime
7+
8+
9+
def make_datetime(date, time):
10+
datetime = str(date) + 'T' + str(time)
11+
return datetime
12+
13+
14+
def main():
15+
date = '2020-07-10'
16+
time = '20:10:00'
17+
print('make_datetime(date, time)')
18+
print(make_datetime(date, time))
19+
print("generate_datetime('2000', '07', '10', '12', '00')")
20+
print(generate_datetime('2000', '07', '10', '12', '00'))
21+
22+
23+
if __name__ == '__main__':
24+
main()

0 commit comments

Comments
 (0)