diff --git a/advanced-classes.html b/advanced-classes.html index c4e5069..994115c 100644 --- a/advanced-classes.html +++ b/advanced-classes.html @@ -165,5 +165,5 @@ class OrderedDict(dict, collections.MutableMapping):

© 2001–9 Mark Pilgrim - - + + diff --git a/advanced-iterators.html b/advanced-iterators.html index e44b4d7..5ff1a61 100644 --- a/advanced-iterators.html +++ b/advanced-iterators.html @@ -594,5 +594,5 @@ NameError: name '__import__' is not defined

© 2001–9 Mark Pilgrim - - + + diff --git a/case-study-porting-chardet-to-python-3.html b/case-study-porting-chardet-to-python-3.html index 9b41957..799e67b 100644 --- a/case-study-porting-chardet-to-python-3.html +++ b/case-study-porting-chardet-to-python-3.html @@ -1194,5 +1194,5 @@ tests\EUC-JP\arclamp.jp.xml EUC-JP with confide

© 2001–9 Mark Pilgrim - - + + diff --git a/files.html b/files.html index 74316e2..1fb05cb 100644 --- a/files.html +++ b/files.html @@ -29,5 +29,5 @@ OK, so a string is a sequence of Unicode characters. But a file on disk is not a

© 2001–9 Mark Pilgrim - - + + diff --git a/generators.html b/generators.html index 798ed3f..abdbfcf 100644 --- a/generators.html +++ b/generators.html @@ -409,5 +409,5 @@ def plural(noun):

© 2001–9 Mark Pilgrim - - + + diff --git a/http-web-services.html b/http-web-services.html index 0a87b4b..57ea528 100644 --- a/http-web-services.html +++ b/http-web-services.html @@ -628,5 +628,5 @@ reply: 'HTTP/1.1 301 Moved Permanently'

© 2001–9 Mark Pilgrim - - + + diff --git a/iterators-and-generators.html b/iterators-and-generators.html index 7d7aca1..3a2c761 100644 --- a/iterators-and-generators.html +++ b/iterators-and-generators.html @@ -73,5 +73,5 @@ h1:before{counter-increment:h1;content:""} -->

© 2001–9 Mark Pilgrim - - + + diff --git a/iterators.html b/iterators.html index 3c381b2..230b404 100644 --- a/iterators.html +++ b/iterators.html @@ -377,5 +377,5 @@ rules = LazyRules()

© 2001–9 Mark Pilgrim - - + + diff --git a/dip3.js b/j/dip3.js similarity index 100% rename from dip3.js rename to j/dip3.js diff --git a/ga.js b/j/ga.js similarity index 100% rename from ga.js rename to j/ga.js diff --git a/jquery.js b/j/jquery.js similarity index 100% rename from jquery.js rename to j/jquery.js diff --git a/jquery.min.js b/j/jquery.min.js similarity index 100% rename from jquery.min.js rename to j/jquery.min.js diff --git a/native-datatypes.html b/native-datatypes.html index 4de6c30..6a9ab30 100644 --- a/native-datatypes.html +++ b/native-datatypes.html @@ -476,5 +476,5 @@ KeyError: 'db.diveintopython3.org'

© 2001–9 Mark Pilgrim - - + + diff --git a/porting-code-to-python-3-with-2to3.html b/porting-code-to-python-3-with-2to3.html index 7b996a5..c377789 100644 --- a/porting-code-to-python-3-with-2to3.html +++ b/porting-code-to-python-3-with-2to3.html @@ -1121,5 +1121,5 @@ do_stuff(a_list)

© 2001–9 Mark Pilgrim - - + + diff --git a/publish b/publish index 81b4864..731a719 100755 --- a/publish +++ b/publish @@ -5,7 +5,7 @@ echo "started build" # make build directory and copy original files there for preflighting rm -rf build mkdir build -cp robots.txt *.js *.css build/ +cp robots.txt *.css build/ cp -R j build/ rm -f examples/*.pyc cp -R examples build/ @@ -24,20 +24,20 @@ echo "adding evil tracking code" # add Google Analytics script for f in build/*.html; do - cat "$f" ga.js > build/tmp + cat "$f" j/ga.js > build/tmp mv build/tmp "$f" done # minimize JS and CSS echo "minimizing JS" revision=`hg log|grep changeset|cut -d":" -f3|head -1` -java -jar yuicompressor-2.4.2.jar build/dip3.js > build/dip3-$revision.js +java -jar yuicompressor-2.4.2.jar build/j/dip3.js > build/j/dip3-$revision.js # combine jQuery and our script echo "combining JS" -cat jquery.min.js build/dip3-$revision.js > build/$revision.js -rm build/dip3-$revision.js -sed -i -e "s|||g" build/*.html +cat build/j/jquery.min.js build/j/dip3-$revision.js > build/j/$revision.js +sed -i -e "s|||g" build/*.html +sed -i -e "s| - + + diff --git a/regular-expressions.html b/regular-expressions.html index 3360ae8..5e90f71 100644 --- a/regular-expressions.html +++ b/regular-expressions.html @@ -435,5 +435,5 @@ body{counter-reset:h1 4}

Regular expressions are extremely powerful, but they are not the correct solution for every problem. You should learn enough about them to know when they are appropriate, when they will solve your problems, and when they will cause more problems than they solve.

© 2001–9 Mark Pilgrim - - + + diff --git a/special-method-names.html b/special-method-names.html index 22afc55..ea7aa32 100644 --- a/special-method-names.html +++ b/special-method-names.html @@ -819,5 +819,5 @@ def __exit__(self, *args) -> None:

© 2001–9 Mark Pilgrim - - + + diff --git a/strings.html b/strings.html index 82318a8..9742dd6 100644 --- a/strings.html +++ b/strings.html @@ -435,5 +435,5 @@ TypeError: Can't convert 'bytes' object to str implicitly

© 2001–9 Mark Pilgrim - - + + diff --git a/unit-testing.html b/unit-testing.html index 1f3a330..54b8739 100644 --- a/unit-testing.html +++ b/unit-testing.html @@ -568,5 +568,5 @@ For instance, the testFromRomanCase method (“from_roman -->

© 2001–9 Mark Pilgrim - - + + diff --git a/whats-new.html b/whats-new.html index a54f11f..b5b46f1 100644 --- a/whats-new.html +++ b/whats-new.html @@ -40,5 +40,5 @@ h3:before{content:""}

That’s it for now; the book’s not finished yet! The file I/O subsystem is totally different now; I hope to write about that soon.

© 2001–9 Mark Pilgrim - - + + diff --git a/where-to-go-from-here.html b/where-to-go-from-here.html index 1208ad8..a782617 100644 --- a/where-to-go-from-here.html +++ b/where-to-go-from-here.html @@ -66,5 +66,5 @@ body{counter-reset:h1 20}

© 2001–9 Mark Pilgrim - - + + diff --git a/xml.html b/xml.html index fd7d45f..db1cb4c 100644 --- a/xml.html +++ b/xml.html @@ -641,5 +641,5 @@ lxml.etree.XMLSyntaxError: Entity 'hellip' not defined, line 3, column 28

© 2001–9 Mark Pilgrim - - + + diff --git a/your-first-python-program.html b/your-first-python-program.html index 485b803..dc80e12 100644 --- a/your-first-python-program.html +++ b/your-first-python-program.html @@ -282,5 +282,5 @@ if __name__ == "__main__":

© 2001–9 Mark Pilgrim - - + +