Skip to content

Commit 1fd47fc

Browse files
authored
Merge pull request mikeckennedy#238 from talkpython/master
Sync recent changes back
2 parents 31668c7 + cdb87e8 commit 1fd47fc

File tree

692 files changed

+65406
-1179
lines changed

Some content is hidden

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

692 files changed

+65406
-1179
lines changed

transcripts/002_jesse_davis_talk_python_to_me_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
00:00:00 Talk Python to me. Episode number two with guest Jesse Davis recorded Sunday, April 5th, 2015.
1+
00:00:00 Talk Python To Me. Episode number two with guest Jesse Davis recorded Sunday, April 5th, 2015.
22

3-
00:00:09 Hello and welcome to Talk Python to me, a weekly podcast on Python, the language, the libraries, the ecosystem, and the personalities. This is your
3+
00:00:09 Hello and welcome to Talk Python To Me, a weekly podcast on Python, the language, the libraries, the ecosystem, and the personalities. This is your
44

55
00:00:45 host, Michael Kennedy. Follow me on Twitter where I'm @mkennedy and keep up with the show and listen
66

transcripts/002_jesse_davis_talk_python_to_me_64.vtt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
WEBVTT
22
33
00:00:00.001 --> 00:00:09.760
4-
Talk Python to me. Episode number two with guest Jesse Davis recorded Sunday, April 5th, 2015.
4+
Talk Python To Me. Episode number two with guest Jesse Davis recorded Sunday, April 5th, 2015.
55

66
00:00:09.760 --> 00:00:39.700
7-
Hello and welcome to Talk Python to me, a weekly
7+
Hello and welcome to Talk Python To Me, a weekly
88

99
00:00:39.700 --> 00:00:45.020
1010
podcast on Python, the language, the libraries, the ecosystem, and the personalities. This is your

transcripts/003-Pyramid-Web Framework-Chris-McDonough.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
00:00:00 Talk Python to me. Episode number three. With guest, Chris McDonough. Recorded Monday, April 6th, 2015.
1+
00:00:00 Talk Python To Me. Episode number three. With guest, Chris McDonough. Recorded Monday, April 6th, 2015.
22

3-
00:00:09 Hello and welcome to Talk Python to me, a weekly podcast.
3+
00:00:09 Hello and welcome to Talk Python To Me, a weekly podcast.
44

55
00:00:39 On Python, the language, the libraries, the ecosystem, and the personalities.
66

@@ -228,7 +228,7 @@
228228

229229
00:10:00 Visit patreon.com slash mkennedy.
230230

231-
00:10:02 That's p-a-t-r-e-o-n dot com slash mkennedy and watch the video to see how you can donate as little as $1 per episode to support Talk Python to me.
231+
00:10:02 That's p-a-t-r-e-o-n dot com slash mkennedy and watch the video to see how you can donate as little as $1 per episode to support Talk Python To Me.
232232

233233
00:10:12 This is your chance to ensure that the Python community continues to have a strong public voice.
234234

@@ -1264,7 +1264,7 @@
12641264

12651265
00:43:38 You know, I've had work to do and I took some time off.
12661266

1267-
00:43:41 And I've I've I sort of didn't do as much on on pyramid or any of any of the other pylons
1267+
00:43:41 And I've I've I sort of didn't do as much on pyramid or any of any of the other pylons
12681268

12691269
00:43:47 projects projects.
12701270

@@ -1274,7 +1274,7 @@
12741274

12751275
00:43:55 I should say this.
12761276

1277-
00:43:56 There is a there is a pyramid IRC channel that if you're interested in pyramid on on free
1277+
00:43:56 There is a there is a pyramid IRC channel that if you're interested in pyramid on free
12781278

12791279
00:44:00 know that you should probably get into.
12801280

transcripts/003-Pyramid-Web Framework-Chris-McDonough.vtt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
WEBVTT
22
33
00:00:00.360 --> 00:00:09.200
4-
Talk Python to me. Episode number three. With guest, Chris McDonough. Recorded Monday, April 6th, 2015.
4+
Talk Python To Me. Episode number three. With guest, Chris McDonough. Recorded Monday, April 6th, 2015.
55

66
00:00:09.200 --> 00:00:39.100
7-
Hello and welcome to Talk Python to me, a weekly podcast.
7+
Hello and welcome to Talk Python To Me, a weekly podcast.
88

99
00:00:39.100 --> 00:00:43.320
1010
On Python, the language, the libraries, the ecosystem, and the personalities.
@@ -349,7 +349,7 @@ You might not have heard about Patreon, but it's kind of like Kickstarter for th
349349
Visit patreon.com slash mkennedy.
350350

351351
00:10:02.900 --> 00:10:12.080
352-
That's p-a-t-r-e-o-n dot com slash mkennedy and watch the video to see how you can donate as little as $1 per episode to support Talk Python to me.
352+
That's p-a-t-r-e-o-n dot com slash mkennedy and watch the video to see how you can donate as little as $1 per episode to support Talk Python To Me.
353353

354354
00:10:12.080 --> 00:10:17.920
355355
This is your chance to ensure that the Python community continues to have a strong public voice.
@@ -1906,7 +1906,7 @@ But over the last year or so, I have had to go and work.
19061906
You know, I've had work to do and I took some time off.
19071907

19081908
00:43:41.180 --> 00:43:47.920
1909-
And I've I've I sort of didn't do as much on on pyramid or any of any of the other pylons
1909+
And I've I've I sort of didn't do as much on pyramid or any of any of the other pylons
19101910

19111911
00:43:47.920 --> 00:43:49.560
19121912
projects projects.
@@ -1921,7 +1921,7 @@ Michael miracle is he's on.
19211921
I should say this.
19221922

19231923
00:43:56.420 --> 00:44:00.600
1924-
There is a there is a pyramid IRC channel that if you're interested in pyramid on on free
1924+
There is a there is a pyramid IRC channel that if you're interested in pyramid on free
19251925

19261926
00:44:00.600 --> 00:44:01.620
19271927
know that you should probably get into.

transcripts/005_mike_bayer_SQLAlchemy_and_data_access_in_Python.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
00:00:00 Talk Python to me, episode number five, with guest Mike Baer, recorded Thursday, April 9th, 2015.
1+
00:00:00 Talk Python To Me, episode number five, with guest Mike Baer, recorded Thursday, April 9th, 2015.
22

33
00:00:07 Hello and welcome to Talk Python to Me, a weekly podcast on Python, the language, the libraries, the ecosystem, and the personalities.
44

@@ -870,7 +870,7 @@
870870

871871
00:27:23 Visit patreon.com/mkennedy.com/mkennedy and watch the video to see how you can donate as little
872872

873-
00:27:31 as $1 per episode to support Talk Python to me.
873+
00:27:31 as $1 per episode to support Talk Python To Me.
874874

875875
00:27:34 This is your chance to ensure that the Python community continues to have a strong public voice.
876876

transcripts/005_mike_bayer_SQLAlchemy_and_data_access_in_Python.vtt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
WEBVTT
22
33
00:00:00.001 --> 00:00:07.960
4-
Talk Python to me, episode number five, with guest Mike Baer, recorded Thursday, April 9th, 2015.
4+
Talk Python To Me, episode number five, with guest Mike Baer, recorded Thursday, April 9th, 2015.
55

66
00:00:07.960 --> 00:00:37.380
77
Hello and welcome to Talk Python to Me, a weekly podcast on Python,
@@ -1330,7 +1330,7 @@ podcasts, which release frequent small deliverables rather than one-off large en
13301330
Visit patreon.com/mkennedy.com/mkennedy and watch the video to see how you can donate as little
13311331

13321332
00:27:31.980 --> 00:27:34.940
1333-
as $1 per episode to support Talk Python to me.
1333+
as $1 per episode to support Talk Python To Me.
13341334

13351335
00:27:34.940 --> 00:27:41.200
13361336
This is your chance to ensure that the Python community continues to have a strong public voice.

transcripts/012_Deep_dive_into_Modules_and_Packages.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
00:01:34 You can sign up and expect to get five offers within the first week, and salary and equity presented right up front.
3232

33-
00:01:42 Check them out and get a very special offer at Hired.com slash Talk Python to me.
33+
00:01:42 Check them out and get a very special offer at Hired.com slash Talk Python To Me.
3434

3535
00:01:47 Think them on Twitter, where they're at Hired underscore HQ.
3636

@@ -1308,7 +1308,7 @@
13081308

13091309
00:36:19 So if you had a if you had a like a package directory spam and then you had two files in there, you know, like foo and bar dot foo dot pi bar dot pi.
13101310

1311-
00:36:30 In Python two, you can one of those files like like bar dot pi can just say import foo and it will find it in the same directory.
1311+
00:36:30 In Python two, you can one of those files like bar dot pi can just say import foo and it will find it in the same directory.
13121312

13131313
00:36:38 That does not work in Python three.
13141314

transcripts/012_Deep_dive_into_Modules_and_Packages.vtt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ You can sign up and expect to get five offers within the first week,
6464
and salary and equity presented right up front.
6565

6666
00:01:42.080 --> 00:01:47.420
67-
Check them out and get a very special offer at Hired.com slash Talk Python to me.
67+
Check them out and get a very special offer at Hired.com slash Talk Python To Me.
6868

6969
00:01:47.840 --> 00:01:51.300
7070
Think them on Twitter, where they're at Hired underscore HQ.
@@ -1981,7 +1981,7 @@ You know, one thing that might impact people is you can't do a relative import w
19811981
So if you had a if you had a like a package directory spam and then you had two files in there, you know, like foo and bar dot foo dot pi bar dot pi.
19821982

19831983
00:36:30.260 --> 00:36:38.920
1984-
In Python two, you can one of those files like like bar dot pi can just say import foo and it will find it in the same directory.
1984+
In Python two, you can one of those files like bar dot pi can just say import foo and it will find it in the same directory.
19851985

19861986
00:36:38.920 --> 00:36:41.660
19871987
That does not work in Python three.

transcripts/013_Flask_web_framework_and_much_much_more.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,11 +664,11 @@
664664

665665
00:23:41 And as Talk Python listeners, it gets way sweeter.
666666

667-
00:23:45 Use the link Hired.com slash Talk Python to me and Hired will double the signing bonus to $4,000.
667+
00:23:45 Use the link Hired.com slash Talk Python To Me and Hired will double the signing bonus to $4,000.
668668

669669
00:23:52 Opportunity's knocking.
670670

671-
00:23:54 Visit Hired.com slash Talk Python to me and answer the call.
671+
00:23:54 Visit Hired.com slash Talk Python To Me and answer the call.
672672

673673
00:24:06 So the thing is, I'm not using Flask extension myself much.
674674

transcripts/013_Flask_web_framework_and_much_much_more.vtt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,13 +1024,13 @@ Everyone who accepts a job from Hired gets a $2,000 signing bonus.
10241024
And as Talk Python listeners, it gets way sweeter.
10251025

10261026
00:23:45.420 --> 00:23:52.980
1027-
Use the link Hired.com slash Talk Python to me and Hired will double the signing bonus to $4,000.
1027+
Use the link Hired.com slash Talk Python To Me and Hired will double the signing bonus to $4,000.
10281028

10291029
00:23:52.980 --> 00:23:54.700
10301030
Opportunity's knocking.
10311031

10321032
00:23:54.700 --> 00:23:58.320
1033-
Visit Hired.com slash Talk Python to me and answer the call.
1033+
Visit Hired.com slash Talk Python To Me and answer the call.
10341034

10351035
00:24:06.600 --> 00:24:10.500
10361036
So the thing is, I'm not using Flask extension myself much.

0 commit comments

Comments
 (0)