Katrashova branch by KseniaKatrashova · Pull Request #72 · IlyaOrlov/PythonCourse2.0_August22

KseniaKatrashova · 2022-10-04T12:20:10Z

4.5

не могу найти ошибку, подскажите Traceback (most recent call last): File "C:\Users\Евгений\Desktop\git\PythonCourse2.0_August22\Practice\Katrashova\les4.5.py", line 4, in <module> c = random.randint(a, b) NameError: name 'random' is not defined

…ugust22 into KatrashovaBranch

IlyaOrlov

Оставил замечания.

IlyaOrlov · 2022-10-04T13:02:04Z

@@ -1,4 +1,4 @@
-s = ""
+ s = ""


Лишний пробел закрался.

Оу, а это вообще левый файл. Стоит сделать git pull origin main

IlyaOrlov

Остались небольшие замечания.

…ugust22 into KatrashovaBranch

IlyaOrlov

ОК. Остались вопросы. И надо что-то делать с чужим файлом RybnikovS/Lec 04/Task 03.py (стоит его напрямую из main себе скопировать).

…ugust22 into KatrashovaBranch

IlyaOrlov

Добавил замечания + остались старые вопросы.

IlyaOrlov · 2022-10-09T21:41:12Z

@@ -8,6 +8,6 @@ def sort(arr):
            arr[m], arr[i] = arr[i], arr[m]


Ещё один лишний файл появился.

IlyaOrlov

ОК. Новых замечаний нет, но со старыми надо разобраться.

…ugust22 into KatrashovaBranch � Conflicts: � Practice/esafonova/task5.1.py

IlyaOrlov

Добавил новые замечания. И остались старые.

IlyaOrlov · 2022-10-14T09:25:41Z

+    def show(self):
+        print(f"Танк {self.name}  экипажем {self.crew} человек(а), и массой {self.weight}")
+
+    def __lt__(self, other):


Метод __lt__ должен возвращать True или False, если в задании не указано иное.

…ugust22 into KatrashovaBranch

IlyaOrlov

ОК. Остались еще замечания.

…ugust22 into KatrashovaBranch

IlyaOrlov

Новых замечаний нет. Но старые нужно исправить!

…ugust22 into KatrashovaBranch

IlyaOrlov

Еще осталось замечание по lesson5/5.1.py
И надо еще сделать git pull origin main (при конфликте выбрать изменения с main, не свои).
Потому что левые файлы удалили, но они при мерже в main и там удалятся.

KseniaKatrashova added 2 commits October 4, 2022 15:19

4.5

dc1b77e

не могу найти ошибку, подскажите Traceback (most recent call last): File "C:\Users\Евгений\Desktop\git\PythonCourse2.0_August22\Practice\Katrashova\les4.5.py", line 4, in <module> c = random.randint(a, b) NameError: name 'random' is not defined

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

04b6123

…ugust22 into KatrashovaBranch

IlyaOrlov requested changes Oct 4, 2022

View reviewed changes

KseniaKatrashova added 3 commits October 4, 2022 19:08

4.5

67a7f57

4.6

9a321f9

4.8

6af927c

IlyaOrlov requested changes Oct 6, 2022

View reviewed changes

Comment thread Practice/Katrashova/lesson4/les 4.6.py

Comment thread Practice/Katrashova/lesson4/les4.8.py Outdated

KseniaKatrashova added 3 commits October 7, 2022 12:20

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

aa26a35

…ugust22 into KatrashovaBranch

4.7

7c630ce

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

45092e1

…ugust22 into KatrashovaBranch

IlyaOrlov requested changes Oct 9, 2022

View reviewed changes

Comment thread Practice/Katrashova/lesson4/les4.7.py Outdated

KseniaKatrashova added 3 commits October 9, 2022 16:45

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

7d53613

…ugust22 into KatrashovaBranch

5.1

1d9d456

5.1 and 5.2

e3b3eab

IlyaOrlov requested changes Oct 9, 2022

View reviewed changes

задания по 5 лекции

3e2aa9b

IlyaOrlov requested changes Oct 12, 2022

View reviewed changes

KseniaKatrashova added 2 commits October 13, 2022 12:21

исправление и задания 6

97d7437

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

f0d8599

…ugust22 into KatrashovaBranch � Conflicts: � Practice/esafonova/task5.1.py

IlyaOrlov requested changes Oct 14, 2022

View reviewed changes

KseniaKatrashova added 3 commits October 14, 2022 15:56

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

ff49008

…ugust22 into KatrashovaBranch

лекция 7

65c81bc

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

0fe3af9

…ugust22 into KatrashovaBranch

IlyaOrlov requested changes Oct 15, 2022

View reviewed changes

KseniaKatrashova added 2 commits October 18, 2022 20:39

лекция 8

c779204

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

b0c13ea

…ugust22 into KatrashovaBranch

IlyaOrlov requested changes Oct 19, 2022

View reviewed changes

KseniaKatrashova added 3 commits October 24, 2022 09:50

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

a4d356e

…ugust22 into KatrashovaBranch

Merge branch 'main' of https://github.com/IlyaOrlov/PythonCourse2.0_A…

b22793a

…ugust22 into KatrashovaBranch

func в переменную и возвращаем

dfc5306

KseniaKatrashova and others added 5 commits October 30, 2022 11:35

исправлено

7dc211c

исправлено

4e491eb

Delete task_5.py

5d191cf

Delete task5.1.py

f7af689

Delete Task 03.py

63edb1f

IlyaOrlov requested changes Nov 2, 2022

View reviewed changes

		@@ -8,6 +8,6 @@ def sort(arr):
		arr[m], arr[i] = arr[i], arr[m]

Conversation

KseniaKatrashova commented Oct 4, 2022

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

IlyaOrlov Oct 4, 2022

Choose a reason for hiding this comment

Uh oh!

IlyaOrlov Oct 6, 2022

Choose a reason for hiding this comment

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

IlyaOrlov Oct 9, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

IlyaOrlov Oct 14, 2022

Choose a reason for hiding this comment

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

IlyaOrlov left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants