From 725b4dba86db7439589de0463f550d24d03cd2b7 Mon Sep 17 00:00:00 2001 From: Mark Pilgrim Date: Wed, 28 Jan 2009 00:07:18 -0500 Subject: [PATCH] bunch of minor changes for first content push --HG-- rename : dip2.html => dip2 --- .htaccess | 1 + case-study-porting-chardet-to-python-3.html | 8 +++ dip2.html => dip2 | 0 dip3.css | 1 - index.html | 56 ++++++++++++++++----- porting-code-to-python-3-with-2to3.html | 6 ++- 6 files changed, 57 insertions(+), 15 deletions(-) rename dip2.html => dip2 (100%) diff --git a/.htaccess b/.htaccess index 27c6bb9..5480678 100644 --- a/.htaccess +++ b/.htaccess @@ -7,6 +7,7 @@ AddType text/xsl .xslt AddType application/xml .atom AddType text/html .xo AddType text/plain .txt +AddType text/plain .py AddType video/mp4 .mp4 AddType application/x-srt .srt AddType video/ogg .ogv diff --git a/case-study-porting-chardet-to-python-3.html b/case-study-porting-chardet-to-python-3.html index 78f3bf7..db3033b 100644 --- a/case-study-porting-chardet-to-python-3.html +++ b/case-study-porting-chardet-to-python-3.html @@ -4,6 +4,9 @@ Case study: porting chardet to Python 3 - Dive into Python 3 +

Case study: porting chardet to Python 3

@@ -724,5 +727,10 @@ TypeError: Can't convert 'bytes' object to str implicitly

...

+ + + diff --git a/dip2.html b/dip2 similarity index 100% rename from dip2.html rename to dip2 diff --git a/dip3.css b/dip3.css index 66b3f39..d2e68ff 100644 --- a/dip3.css +++ b/dip3.css @@ -12,7 +12,6 @@ h1{background:papayawhip;color:#000;width:100%;margin:0} #index h2{margin-left:1.75em} #index h3{margin-left:3.5em} pre{white-space:pre-wrap;font-size:medium;line-height:2.154} -cite{font-style:normal} img{border:0} .framed{border:1px solid} pre,blockquote{line-height:2.154;margin:2.154em 0;padding:0 0 0 2.154em;border-left:1px dotted} diff --git a/index.html b/index.html index 30ddca2..70b11c8 100644 --- a/index.html +++ b/index.html @@ -2,15 +2,16 @@ -Dive into Python 3 +Dive Into Python 3 -

Dive into Python 3 will cover Python 3 and its differences from Python 2. Compared to the original Dive into Python, it will be about 50% revised and 50% new material. I will publish drafts online as I go. The final book will be published on paper by Apress. The book will remain online under the CC-BY-3.0 license.

-

Below is the draft table of contents. Only a few chapters have been written so far. Yes, that is PapayaWhip. All hail PapayaWhip.

+

Dive Into Python 3 will cover Python 3 and its differences from Python 2. Compared to the original Dive Into Python, it will be about 50% revised and 50% new material. I will publish drafts online as I go. The final book will be published on paper by Apress. The book will remain online under the CC-BY-3.0 license.

+

Below is the draft table of contents. It is not finalized. Only a few chapters have been written so far. The rest is just stubs and random notes to myself.

+

Yes, that is PapayaWhip. All hail PapayaWhip.

Installing Python

@@ -755,7 +756,36 @@
-

Case study: porting chardet to Python 3

+

Case study: porting chardet to Python 3

+ +
+

Diving in

+
+ +
+

Running 2to3

+
+ +
+

False is invalid syntax

+
+ +
+

No module named constants

+
+ +
+

Name 'file' is not defined

+
+ +
+

Can't use a string pattern on a bytes-like object

+
+ +
+

Can't convert 'bytes' object to str implicitly

+
+
@@ -850,15 +880,6 @@
-
-

SOAP web services

- -
-

...no one will miss you...

-
- -
-

Functional programming

@@ -868,6 +889,15 @@
+
+

SOAP web services

+ +
+

...no one will miss you...

+
+ +
+