diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/globeop.py | 6 | ||||
| -rw-r--r-- | python/task_server/globeop.py | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/python/globeop.py b/python/globeop.py index e0c56fbb..b3b60c80 100644 --- a/python/globeop.py +++ b/python/globeop.py @@ -1,6 +1,6 @@ import logging import argparse -import pandas as pd +import datetime from task_server.globeop import download_data, upload_data from sqlalchemy import create_engine @@ -16,8 +16,8 @@ group.add_argument("-d", "--download", action="store_true", help="download reports from GlobeOp") group.add_argument("-u", "--upload", action="store_true", help="upload marks to GlobeOp") -parser.add_argument("date", nargs='?', type=lambda s: pd.datetime.strptime(s, "%Y-%m-%d"), - default=pd.datetime.today()) +parser.add_argument("date", nargs='?', type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d").date(), + default=datetime.date.today()) args = parser.parse_args() if args.download: diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py index b6942761..84c3230b 100644 --- a/python/task_server/globeop.py +++ b/python/task_server/globeop.py @@ -56,13 +56,12 @@ def get_gpg(): gpg = gnupg.GPG(gpgbinary = r'"c:\\Program Files (x86)\\GNU\\GnuPG\\gpg2.exe"',
gnupghome = os.path.join(os.getenv('APPDATA'), "gnupg"))
elif os.name == 'posix':
- gpg = gnupg.GPG(gnupghome = '/home/guillaume/.gnupg')
+ gpg = gnupg.GPG(homedir = '/home/guillaume/.gnupg')
gpg.encoding = 'utf8'
return gpg
def download_data(workdate):
ftp = get_ftp('outgoing')
- workdate = workdate.date()
files = ftp.nlst()
pnlfiles = [filename for filename in files if "csv" in filename and \
"Profit" in filename if get_ped(filename) < workdate]
@@ -100,8 +99,10 @@ def download_data(workdate): else:
newfilename = "CDS_Report.xls"
with open(os.path.join(reports_dir, filename), "rb") as fh:
- gpg.decrypt_file(fh, output = os.path.join(reports_dir, newfilename),
- passphrase=config.key_password)
+ dec = gpg.decrypt_file(fh, output = os.path.join(reports_dir, newfilename),
+ passphrase=config.key_password,
+ always_trust=True)
+ logger.info('{0}: {1}'.format(filename, dec.status))
os.remove(os.path.join(reports_dir, filename))
if os.path.exists(os.path.join(reports_dir, "CDS_Report.xls")):
df = pd.read_excel(os.path.join(reports_dir, "CDS_Report.xls"), sheetname=1, skiprows=[0,1,2,3])
|