diff --git a/i/cover.jpg b/i/cover.jpg new file mode 100644 index 0000000..a74e3a2 Binary files /dev/null and b/i/cover.jpg differ diff --git a/index.html b/index.html index 661099f..01aa1e0 100644 --- a/index.html +++ b/index.html @@ -23,7 +23,7 @@ h1:before,h2:before{content:''}

Table of Contents (expand)

-

Also available on dead trees!
Dive Into Python 3 +

Also available on dead trees!
Dive Into Python 3

    diff --git a/installing-python.html b/installing-python.html index 59df064..411ea68 100755 --- a/installing-python.html +++ b/installing-python.html @@ -8,6 +8,7 @@ body{counter-reset:h1 0} .i{list-style:none;margin:0;padding:0} #which{padding-top:1.75em} h2,.i>li{clear:both} +#divingin,#which{clear:none} diff --git a/j/plug.html b/j/plug.html new file mode 100644 index 0000000..1ef1fe2 --- /dev/null +++ b/j/plug.html @@ -0,0 +1 @@ +

    Also available on dead trees!
    Dive Into Python 3     diff --git a/publish b/publish index e4803c9..87db9f2 100755 --- a/publish +++ b/publish @@ -115,13 +115,14 @@ java -jar util/yuicompressor-2.4.2.jar build/dip3.css > build/$revision.css && \ # put CSS inline and remove unused CSS properties on a page-by-page basis # minimize URLs by stripping "http:" prefix # add asynchronous Google Analytics script in head (after inline styles) -echo "inlining CSS, minimizing URLs, adding evil tracking code" +echo "inlining CSS, minimizing URLs, adding evil tracking code and affiliate links" ga=`cat j/ga.js` +plug=`cat j/plug.html` for f in build/*.html; do css=`python2.5 util/lesscss.py "$f" "build/$revision.css"` || die "Failed to remove unused CSS" mobilecss=`python2.5 util/lesscss.py "$f" "build/m-$revision.css"` || die "Failed to remove unused CSS" printcss=`python2.5 util/lesscss.py "$f" "build/p-$revision.css"` || die "Failed to remove unused CSS" - sed -i -e "s|||g" -e "s|||g" -e "s|||g" -e "s||${ga}|g" "$f" || die "Failed to inline CSS" + sed -i -e "s|||g" -e "s|||g" -e "s|||g" -e "s||${ga}|g" -e "s|

    |${plug}

    |g" "$f" || die "Failed to inline CSS" done # set file permissions (hg resets these, don't know why) @@ -129,7 +130,7 @@ chmod 755 build/examples build/j build/i build/d && \ chmod 644 build/*.html build/*.css build/*.txt build/*.zip build/examples/* build/examples/.htaccess build/j/* build/j/.htaccess build/i/* build/i/.htaccess build/d/.htaccess build/.htaccess || die "Failed to reset file permissions" # ship it! -#die "Aborting without publishing" +die "Aborting without publishing" echo -n "publishing" rsync -essh -a build/d/.htaccess build/*.zip diveintomark.org:~/web/diveintopython3.org/d/ && \ echo -n "." && \ diff --git a/strings.html b/strings.html index 829536a..478c0df 100755 --- a/strings.html +++ b/strings.html @@ -250,13 +250,13 @@ experience of years. 

     >>> query = 'user=pilgrim&database=master&password=PapayaWhip'
->>> a_list = query.split('&')                            ①
+>>> a_list = query.split('&')                                        ①
 >>> a_list
 ['user=pilgrim', 'database=master', 'password=PapayaWhip']
->>> a_list_of_lists = [v.split('=', 1) for v in a_list]  ②
+>>> a_list_of_lists = [v.split('=', 1) for v in a_list if '=' in v]  ②
 >>> a_list_of_lists
 [['user', 'pilgrim'], ['database', 'master'], ['password', 'PapayaWhip']]
->>> a_dict = dict(a_list_of_lists)                       ③
+>>> a_dict = dict(a_list_of_lists)                                   ③
 >>> a_dict
 {'password': 'PapayaWhip', 'user': 'pilgrim', 'database': 'master'}