From 24d0c7303505851b6ca2fc12286f1a954b937187 Mon Sep 17 00:00:00 2001 From: Kuznetsov Mikhail Date: Thu, 7 Nov 2024 20:30:06 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B1=D0=B5=D1=81=D0=BA=D0=BE=D0=BD=D0=B5=D1=87=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=86=D0=B8=D0=BA=D0=BB=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catprinter.py | 4 ++-- main.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catprinter.py b/catprinter.py index deb16e8..80fc217 100644 --- a/catprinter.py +++ b/catprinter.py @@ -8,7 +8,7 @@ def draw_cat(): """ return cat -def draw_cats(num_cats): - for i in range(num_cats): +def draw_cats(): + while True: pretty_print(draw_cat()) diff --git a/main.py b/main.py index f6ee5aa..cebbf81 100644 --- a/main.py +++ b/main.py @@ -2,7 +2,7 @@ def main(): - draw_cats(10) + draw_cats() if __name__ == '__main__': main() From 7e9cee357ace1e5d979b3dafa760bfdb985a1e59 Mon Sep 17 00:00:00 2001 From: Kuznetsov Mikhail Date: Thu, 7 Nov 2024 21:07:58 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=BE=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catprinter.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catprinter.py b/catprinter.py index 80fc217..19129bc 100644 --- a/catprinter.py +++ b/catprinter.py @@ -5,6 +5,8 @@ def draw_cat(): /\_/\ ( o.o ) > ^ < + +(press ctr+C to stop) """ return cat From 92de261444d8cb75131cf5940676fe09491d67a8 Mon Sep 17 00:00:00 2001 From: Kuznetsov Mikhail Date: Thu, 7 Nov 2024 20:39:02 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catprinter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catprinter.py b/catprinter.py index deb16e8..d515393 100644 --- a/catprinter.py +++ b/catprinter.py @@ -2,9 +2,9 @@ def draw_cat(): cat = r""" - /\_/\ -( o.o ) - > ^ < + /\_/\ /\_/\ /\_/\ +( o.o ) ( o.o ) ( o.o ) + > ^ < > ^ < > ^ < """ return cat From 337157cbd63165157576afac9f6b104fdbb56d64 Mon Sep 17 00:00:00 2001 From: Kuznetsov Mikhail Date: Thu, 7 Nov 2024 20:26:54 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D1=82=D1=8B=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- printer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/printer.py b/printer.py index 1d79416..b6658df 100644 --- a/printer.py +++ b/printer.py @@ -4,10 +4,10 @@ "\033[91m", # Red "\033[92m", # Green "\033[93m", # Yellow - "-\033[94m", # Blue + "\033[94m", # Blue "\033[95m", # Magenta "\033[96m", # Cyan - "-\033[97m", # White + "\033[97m", # White ] reset_color = "\033[0m" From 1f848cd6facb5866469ac7295f0f5bdfd804a585 Mon Sep 17 00:00:00 2001 From: Yakomissarova Date: Fri, 10 Oct 2025 16:12:35 +0300 Subject: [PATCH 5/5] Resolve merge conflict in colors --- catprinter.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/catprinter.py b/catprinter.py index b8681ae..71069fe 100644 --- a/catprinter.py +++ b/catprinter.py @@ -2,17 +2,14 @@ def draw_cat(): cat = r""" -<<<<<<< HEAD - /\_/\ /\_/\ /\_/\ -( o.o ) ( o.o ) ( o.o ) - > ^ < > ^ < > ^ < -======= + + + /\_/\ ( o.o ) > ^ < -(press ctr+C to stop) ->>>>>>> feature-loop + """ return cat