diff --git a/README.md b/README.md index bd82298..e9829c8 100644 --- a/README.md +++ b/README.md @@ -3201,7 +3201,7 @@ c 6 7 ```text +------------------------+---------------+------------+------------+--------------------------+ -| | 'outer' | 'inner' | 'left' | description | +| | 'outer' | 'inner' | 'left' | Description | +------------------------+---------------+------------+------------+--------------------------+ | l.merge(r, on='y', | x y z | x y z | x y z | Joins/merges on column. | | how=…) | 0 1 2 . | 3 4 5 | 1 2 . | Also accepts left_on and | @@ -3389,8 +3389,8 @@ def main(): def scrape_data(): def scrape_yahoo(id_): BASE_URL = 'https://query1.finance.yahoo.com/v7/finance/download/' - now = int(datetime.datetime.now().timestamp()) - url = f'{BASE_URL}{id_}?period1=1579651200&period2={now}&interval=1d&events=history' + now = int(datetime.datetime.now().timestamp()) + url = f'{BASE_URL}{id_}?period1=1579651200&period2={now}&interval=1d&events=history' return pd.read_csv(url, usecols=['Date', 'Close']).set_index('Date').Close covid = pd.read_csv('https://covid.ourworldindata.org/data/owid-covid-data.csv', usecols=['date', 'total_cases']) diff --git a/index.html b/index.html index b9aa9f1..a4049f5 100644 --- a/index.html +++ b/index.html @@ -2721,7 +2721,7 @@ c 6 7
┏━━━━━━━━━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━┯━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-┃ │ 'outer' │ 'inner' │ 'left' │ description ┃
+┃ │ 'outer' │ 'inner' │ 'left' │ Description ┃
┠────────────────────────┼───────────────┼────────────┼────────────┼──────────────────────────┨
┃ l.merge(r, on='y', │ x y z │ x y z │ x y z │ Joins/merges on column. ┃
┃ how=…) │ 0 1 2 . │ 3 4 5 │ 1 2 . │ Also accepts left_on and ┃
@@ -2873,8 +2873,8 @@ plotly.express.line(df, x='Date', y=def scrape_data():
def scrape_yahoo(id_):
BASE_URL = 'https://query1.finance.yahoo.com/v7/finance/download/'
- now = int(datetime.datetime.now().timestamp())
- url = f'{BASE_URL}{id_}?period1=1579651200&period2={now}&interval=1d&events=history'
+ now = int(datetime.datetime.now().timestamp())
+ url = f'{BASE_URL}{id_}?period1=1579651200&period2={now}&interval=1d&events=history'
return pd.read_csv(url, usecols=['Date', 'Close']).set_index('Date').Close
covid = pd.read_csv('https://covid.ourworldindata.org/data/owid-covid-data.csv',
usecols=['date', 'total_cases'])
diff --git a/parse.js b/parse.js
index a2845cb..e654104 100755
--- a/parse.js
+++ b/parse.js
@@ -302,7 +302,7 @@ const DIAGRAM_15_A =
const DIAGRAM_15_B =
"┏━━━━━━━━━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━┯━━━━━━━━━━━━┯━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n" +
- "┃ │ 'outer' │ 'inner' │ 'left' │ description ┃\n" +
+ "┃ │ 'outer' │ 'inner' │ 'left' │ Description ┃\n" +
"┠────────────────────────┼───────────────┼────────────┼────────────┼──────────────────────────┨\n" +
"┃ l.merge(r, on='y', │ x y z │ x y z │ x y z │ Joins/merges on column. ┃\n" +
"┃ how=…) │ 0 1 2 . │ 3 4 5 │ 1 2 . │ Also accepts left_on and ┃\n" +