From c96afa470f2aa0bf7f21c765349600c471777318 Mon Sep 17 00:00:00 2001
From: Holger <holger@nahrstaedt.de>
Date: Sat, 30 Jun 2018 08:14:29 +0200
Subject: [PATCH] Add conversion of datetime objects to timestamp in
get_steem_per_mvest
---
beem/steem.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/beem/steem.py b/beem/steem.py
index 59beb540..ab28b0f3 100644
--- a/beem/steem.py
+++ b/beem/steem.py
@@ -11,8 +11,9 @@ import re
import os
import math
import ast
+import time
from beemgraphenebase.py23 import bytes_types, integer_types, string_types, text_type
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
from beemapi.steemnoderpc import SteemNodeRPC
from beemapi.exceptions import NoAccessApi, NoApiWithName
from beemgraphenebase.account import PrivateKey, PublicKey
@@ -29,7 +30,7 @@ from .exceptions import (
from .wallet import Wallet
from .steemconnect import SteemConnect
from .transactionbuilder import TransactionBuilder
-from .utils import formatTime, resolve_authorperm, derive_permlink, remove_from_dict
+from .utils import formatTime, resolve_authorperm, derive_permlink, remove_from_dict, addTzInfo
from beem.constants import STEEM_VOTE_REGENERATION_SECONDS, STEEM_100_PERCENT, STEEM_1_PERCENT
log = logging.getLogger(__name__)
@@ -444,11 +445,15 @@ class Steem(object):
def get_steem_per_mvest(self, time_stamp=None, use_stored_data=True):
""" Returns the MVEST to STEEM ratio
- :param datetime time_stamp: (optional) if set, return an estimated
+ :param int time_stamp: (optional) if set, return an estimated
STEEM per MVEST ratio for the given time stamp. If unset the
- current ratio is returned (default).
+ current ratio is returned (default). (can also be a datetime object)
"""
if time_stamp is not None:
+ if isinstance(time_stamp, (datetime, date)):
+ time_stamp = addTzInfo(time_stamp)
+ epoch = addTzInfo(datetime(1970, 1, 1))
+ time_stamp = (time_stamp - epoch) // timedelta(seconds=1)
a = 2.1325476281078992e-05
b = -31099.685481490847
a2 = 2.9019227739473682e-07
--
GitLab