From 05937e9873cb3d4108ebadce8c157d9c1eb8e4dc Mon Sep 17 00:00:00 2001 From: oovk Date: Thu, 26 Aug 2021 21:51:11 +0530 Subject: [PATCH 1/5] added example to Dataframe.get --- pandas/core/generic.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 4927f479ba905..c5d6e67ae9862 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -3991,6 +3991,33 @@ def get(self, key, default=None): Returns ------- value : same type as items contained in object + + Examples + -------- + >>> df = pd.DataFrame([[24.3, 75.7, 'high'], + ... [31, 87.8, 'high'], + ... [22, 71.6, 'medium'], + ... [35, 95, 'medium']], + ... columns=['temp_celsius', 'temp_fahrenheit', + ... 'windspeed'], + ... index=pd.date_range(start='2014-02-12', + ... end='2014-02-15', freq='D')) + + >>> df + temp_celsius temp_fahrenheit windspeed + 2014-02-12 24.3 75.7 high + 2014-02-13 31.0 87.8 high + 2014-02-14 22.0 71.6 medium + 2014-02-15 35.0 95.0 medium + + >>> df1 = df.get(["temp_celsius","windspeed"]) + + >>> df1 + temp_celsius windspeed + 2014-02-12 24.3 high + 2014-02-13 31.0 high + 2014-02-14 22.0 medium + 2014-02-15 35.0 medium """ try: return self[key] From 7e68173864665ededc40c8a0195194bbbe8c09f8 Mon Sep 17 00:00:00 2001 From: oovk Date: Fri, 27 Aug 2021 15:20:45 +0530 Subject: [PATCH 2/5] added example for default param in dataframe.get doc --- pandas/core/generic.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index a578ca9b4950a..94f155c94b7a5 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -4018,6 +4018,11 @@ def get(self, key, default=None): 2014-02-13 31.0 high 2014-02-14 22.0 medium 2014-02-15 35.0 medium + + >>> df2 = df.get(["temp_celsius","temp_kelvin"], default = "default_value") + + >>> df2 + 'default_value' """ try: return self[key] From 0b7cdbab5d60b1b7f1df579f1332e9a3d508e395 Mon Sep 17 00:00:00 2001 From: oovk Date: Fri, 27 Aug 2021 15:41:30 +0530 Subject: [PATCH 3/5] made suggested changes in dataframe.get example --- pandas/core/generic.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 94f155c94b7a5..4154761503e4c 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -4011,8 +4011,6 @@ def get(self, key, default=None): 2014-02-15 35.0 95.0 medium >>> df1 = df.get(["temp_celsius","windspeed"]) - - >>> df1 temp_celsius windspeed 2014-02-12 24.3 high 2014-02-13 31.0 high @@ -4020,9 +4018,7 @@ def get(self, key, default=None): 2014-02-15 35.0 medium >>> df2 = df.get(["temp_celsius","temp_kelvin"], default = "default_value") - - >>> df2 - 'default_value' + 'default_value' """ try: return self[key] From feaa21440a4b1750e46f698d93c30a34f2d5d35c Mon Sep 17 00:00:00 2001 From: oovk Date: Fri, 27 Aug 2021 15:46:59 +0530 Subject: [PATCH 4/5] more changes --- pandas/core/generic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 4154761503e4c..5ace47c2f25a5 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -4010,14 +4010,14 @@ def get(self, key, default=None): 2014-02-14 22.0 71.6 medium 2014-02-15 35.0 95.0 medium - >>> df1 = df.get(["temp_celsius","windspeed"]) + >>> df.get(["temp_celsius","windspeed"]) temp_celsius windspeed 2014-02-12 24.3 high 2014-02-13 31.0 high 2014-02-14 22.0 medium 2014-02-15 35.0 medium - >>> df2 = df.get(["temp_celsius","temp_kelvin"], default = "default_value") + >>> df.get(["temp_celsius","temp_kelvin"], default = "default_value") 'default_value' """ try: From e01ca6d49b4ab39bbc75227e883159dcb21a963d Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 27 Aug 2021 11:54:26 +0100 Subject: [PATCH 5/5] fixup --- pandas/core/generic.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 5ace47c2f25a5..b2f8006daf176 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -3994,14 +3994,16 @@ def get(self, key, default=None): Examples -------- - >>> df = pd.DataFrame([[24.3, 75.7, 'high'], - ... [31, 87.8, 'high'], - ... [22, 71.6, 'medium'], - ... [35, 95, 'medium']], - ... columns=['temp_celsius', 'temp_fahrenheit', - ... 'windspeed'], - ... index=pd.date_range(start='2014-02-12', - ... end='2014-02-15', freq='D')) + >>> df = pd.DataFrame( + ... [ + ... [24.3, 75.7, "high"], + ... [31, 87.8, "high"], + ... [22, 71.6, "medium"], + ... [35, 95, "medium"], + ... ], + ... columns=["temp_celsius", "temp_fahrenheit", "windspeed"], + ... index=pd.date_range(start="2014-02-12", end="2014-02-15", freq="D"), + ... ) >>> df temp_celsius temp_fahrenheit windspeed @@ -4010,14 +4012,16 @@ def get(self, key, default=None): 2014-02-14 22.0 71.6 medium 2014-02-15 35.0 95.0 medium - >>> df.get(["temp_celsius","windspeed"]) + >>> df.get(["temp_celsius", "windspeed"]) temp_celsius windspeed 2014-02-12 24.3 high 2014-02-13 31.0 high 2014-02-14 22.0 medium 2014-02-15 35.0 medium - >>> df.get(["temp_celsius","temp_kelvin"], default = "default_value") + If the key isn't found, the default value will be used. + + >>> df.get(["temp_celsius", "temp_kelvin"], default="default_value") 'default_value' """ try: