Skip to content

Commit c84f999

Browse files
authored
Merge pull request mikeckennedy#234 from talkpython/master
sync back MANY fixes and updates.
2 parents 4f34991 + 6fd598e commit c84f999

File tree

83 files changed

+24732
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+24732
-146
lines changed

transcripts/002_jesse_davis_talk_python_to_me_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@
698698

699699
00:30:05 So you start making that error as well.
700700

701-
00:30:06 Yeah, you're sort of PEP8 compliant straight away.
701+
00:30:06 Yeah, you're sort of PEP 8 compliant straight away.
702702

703703
00:30:09 Exactly.
704704

transcripts/002_jesse_davis_talk_python_to_me_64.vtt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ It also shows you your unused imports and it checks your style while you go.
12461246
So you start making that error as well.
12471247

12481248
00:30:06.900 --> 00:30:09.540
1249-
Yeah, you're sort of PEP8 compliant straight away.
1249+
Yeah, you're sort of PEP 8 compliant straight away.
12501250

12511251
00:30:09.540 --> 00:30:10.880
12521252
Exactly.

transcripts/012_Deep_dive_into_Modules_and_Packages.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -646,19 +646,19 @@
646646

647647
00:17:47 one thing that I thought was interesting that you spoke about the tutorial was that
648648

649-
00:17:52 structure guidelines, the PEP8 guidelines sometimes make your code more brittle in packages
649+
00:17:52 structure guidelines, the PEP 8 guidelines sometimes make your code more brittle in packages
650650

651651
00:17:57 than otherwise should be.
652652

653653
00:17:58 Oh yeah.
654654

655655
00:18:01 Yes.
656656

657-
00:18:01 One of the things with PEP8, I think is it predates some of the work that went on in
657+
00:18:01 One of the things with PEP 8, I think is it predates some of the work that went on in
658658

659659
00:18:06 packages.
660660

661-
00:18:07 I mean, you know, like, like PEP8 sort of talks that you should, you know, well, it
661+
00:18:07 I mean, you know, like, like PEP 8 sort of talks that you should, you know, well, it
662662

663663
00:18:11 sort of says things like, oh, you should just do like an absolute import from kind of a top
664664

@@ -776,21 +776,21 @@
776776

777777
00:20:24 I think it's, I think it's really good advice.
778778

779-
00:20:26 I propose we amend PEP8 to have the package relative imports.
779+
00:20:26 I propose we amend PEP 8 to have the package relative imports.
780780

781-
00:20:31 I wonder when that part was written in PEP8.
781+
00:20:31 I wonder when that part was written in PEP 8.
782782

783783
00:20:34 I mean, it's, I have to, I hate to admit this on like a podcast, but I'm sort of a flagrant
784784

785-
00:20:40 PEP8 violator.
785+
00:20:40 PEP 8 violator.
786786

787787
00:20:42 Don't worry, you, nobody can see the code, so they won't really know about it.
788788

789789
00:20:45 It's fine.
790790

791791
00:20:46 Yeah.
792792

793-
00:20:46 It's, I, I, I don't mean to violate it, but I think it's, you know, PEP8 comes after
793+
00:20:46 It's, I, I, I don't mean to violate it, but I think it's, you know, PEP 8 comes after
794794

795795
00:20:53 the point at which I got involved with Python.
796796

transcripts/012_Deep_dive_into_Modules_and_Packages.vtt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ Nice.
988988
Uh, one thing that I thought was interesting that you spoke about the tutorial was that
989989

990990
00:17:52.240 --> 00:17:57.700
991-
structure guidelines, the PEP8 guidelines sometimes make your code more brittle in packages
991+
structure guidelines, the PEP 8 guidelines sometimes make your code more brittle in packages
992992

993993
00:17:57.700 --> 00:17:58.860
994994
than otherwise should be.
@@ -1000,13 +1000,13 @@ Oh yeah.
10001000
Yes.
10011001

10021002
00:18:01.780 --> 00:18:06.900
1003-
One of the things with PEP8, I think is it predates some of the work that went on in
1003+
One of the things with PEP 8, I think is it predates some of the work that went on in
10041004

10051005
00:18:06.900 --> 00:18:07.380
10061006
packages.
10071007

10081008
00:18:07.380 --> 00:18:11.660
1009-
I mean, you know, like, like PEP8 sort of talks that you should, you know, well, it
1009+
I mean, you know, like, like PEP 8 sort of talks that you should, you know, well, it
10101010

10111011
00:18:11.660 --> 00:18:16.620
10121012
sort of says things like, oh, you should just do like an absolute import from kind of a top
@@ -1183,16 +1183,16 @@ Yeah.
11831183
I think it's, I think it's really good advice.
11841184

11851185
00:20:26.180 --> 00:20:31.220
1186-
I propose we amend PEP8 to have the package relative imports.
1186+
I propose we amend PEP 8 to have the package relative imports.
11871187

11881188
00:20:31.220 --> 00:20:34.280
1189-
I wonder when that part was written in PEP8.
1189+
I wonder when that part was written in PEP 8.
11901190

11911191
00:20:34.280 --> 00:20:40.140
11921192
I mean, it's, I have to, I hate to admit this on like a podcast, but I'm sort of a flagrant
11931193

11941194
00:20:40.140 --> 00:20:41.480
1195-
PEP8 violator.
1195+
PEP 8 violator.
11961196

11971197
00:20:42.660 --> 00:20:45.840
11981198
Don't worry, you, nobody can see the code, so they won't really know about it.
@@ -1204,7 +1204,7 @@ It's fine.
12041204
Yeah.
12051205

12061206
00:20:46.500 --> 00:20:53.280
1207-
It's, I, I, I don't mean to violate it, but I think it's, you know, PEP8 comes after
1207+
It's, I, I, I don't mean to violate it, but I think it's, you know, PEP 8 comes after
12081208

12091209
00:20:53.280 --> 00:20:55.900
12101210
the point at which I got involved with Python.

transcripts/014_Converting_Patreon.com_to_Python_3.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,9 +1204,9 @@
12041204

12051205
00:42:16 That seems like a really good idea.
12061206

1207-
00:42:18 Did you do anything like PyFlakes or any of the sort of PEP8 type checking tools to see how people are doing there?
1207+
00:42:18 Did you do anything like PyFlakes or any of the sort of PEP 8 type checking tools to see how people are doing there?
12081208

1209-
00:42:27 We use, pretty extensively, we use PyCharm inside the company that does the PEP8 checking for us.
1209+
00:42:27 We use, pretty extensively, we use PyCharm inside the company that does the PEP 8 checking for us.
12101210

12111211
00:42:33 And it's actually, I usually did development, I mean, I've usually done development on just like Vim or Emacs,
12121212

transcripts/014_Converting_Patreon.com_to_Python_3.vtt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,10 +1813,10 @@ Yeah, that makes sense.
18131813
That seems like a really good idea.
18141814

18151815
00:42:18.820 --> 00:42:27.260
1816-
Did you do anything like PyFlakes or any of the sort of PEP8 type checking tools to see how people are doing there?
1816+
Did you do anything like PyFlakes or any of the sort of PEP 8 type checking tools to see how people are doing there?
18171817

18181818
00:42:27.260 --> 00:42:33.340
1819-
We use, pretty extensively, we use PyCharm inside the company that does the PEP8 checking for us.
1819+
We use, pretty extensively, we use PyCharm inside the company that does the PEP 8 checking for us.
18201820

18211821
00:42:33.340 --> 00:42:39.860
18221822
And it's actually, I usually did development, I mean, I've usually done development on just like Vim or Emacs,

transcripts/018_quantifiedcode.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@
960960

961961
00:34:57 And it actually prints out an ISBN number of a book that is mentioned in the movie.
962962

963-
00:35:03 And he also ran it through our static analysis software and he found that actually it's not like PEP8 compliant and there's some other things in it.
963+
00:35:03 And he also ran it through our static analysis software and he found that actually it's not like PEP 8 compliant and there's some other things in it.
964964

965965
00:35:09 So it probably shouldn't be security code, which it was in the movie.
966966

transcripts/018_quantifiedcode.vtt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1444,7 +1444,7 @@ And he just wrote down the code because he was interested in what it would do.
14441444
And it actually prints out an ISBN number of a book that is mentioned in the movie.
14451445

14461446
00:35:03.320 --> 00:35:09.820
1447-
And he also ran it through our static analysis software and he found that actually it's not like PEP8 compliant and there's some other things in it.
1447+
And he also ran it through our static analysis software and he found that actually it's not like PEP 8 compliant and there's some other things in it.
14481448

14491449
00:35:09.820 --> 00:35:13.620
14501450
So it probably shouldn't be security code, which it was in the movie.

transcripts/022_cpython.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216

217217
00:07:43 And eventually your program runs.
218218

219-
00:07:45 So we we don't do the parsing stage because I think parsing is fairly standard.
219+
00:07:45 So we don't do the parsing stage because I think parsing is fairly standard.
220220

221221
00:07:50 And that's covered by most kind of introductory compilers classes.
222222

transcripts/022_cpython.vtt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ There's just a lot of C code behind the scenes that keeps track of a lot of stuf
328328
And eventually your program runs.
329329

330330
00:07:45.820 --> 00:07:50.960
331-
So we we don't do the parsing stage because I think parsing is fairly standard.
331+
So we don't do the parsing stage because I think parsing is fairly standard.
332332

333333
00:07:50.960 --> 00:07:54.860
334334
And that's covered by most kind of introductory compilers classes.

0 commit comments

Comments
 (0)