couple of sections of new-and-improved "unit testing" chapter

porting-code-to-python-3-with-2to3.html

@@ -145,7 +145,7 @@ h3:before{counter-increment:h3;content:"A." counter(h2) "." counter(h3) ". "}
 <p id=skipcompareunicode>
 <h2 id=long><code>long</code> data type</h2>
 <p>Python 2 had separate <code>int</code> and <code>long</code> types for non-floating-point numbers. An <code>int</code> could not be any larger than <a href=#renames><code>sys.maxint</code></a>, which varied by platform. Longs were defined by appending an <code>L</code> to the end of the number, and they could be, well, longer than ints. In Python 3, there is only one integer type, called <code>int</code>, which mostly behaves like the <code>long</code> type in Python 2. Since there are no longer two types, there is no need for special syntax to distinguish them.
-<p>Further reading: <a href=http://www.python.org/dev/peps/pep-0237/>PEP 237: Unifying Long Integers and Integers</a>.
+<p>Further reading: <a href=http://www.python.org/dev/peps/pep-0237/><abbr>PEP</abbr> 237: Unifying Long Integers and Integers</a>.
 <p class=skip><a href=#skipcomparelong>skip over this table</a>
 <table id=comparelong>
 <tr><th>Notes</th>
@@ -259,7 +259,7 @@ h3:before{counter-increment:h3;content:"A." counter(h2) "." counter(h3) ". "}
 <h2 id=imports>Modules that have been renamed or reorganized</h2>
 <p>Several modules in the Python Standard Library have been renamed. Several other modules which are related to each other have been combined or reorganized to make their association more logical.
 <h3 id=http><code>http</code></h3>
-<p>In Python 3, several related HTTP modules have been combined into a single package, <code>http</code>.
+<p>In Python 3, several related <abbr>HTTP</abbr> modules have been combined into a single package, <code>http</code>.
 <p class=skip><a href=#skipcompareimporthttp>skip over this table</a>
 <table id=compareimporthttp>
 <tr><th>Notes</th>
@@ -282,10 +282,10 @@ import CGIHttpServer</code></pre></td>
 <td><code>import http.server</code></td></tr>
 </table>
 <ol id=skipcompareimporthttp>
-<li>The <code>http.client</code> module implements a low-level library that can request HTTP resources and interpret HTTP responses.
-<li>The <code>http.cookies</code> module provides a Pythonic interface to browser cookies that are sent in a <code>Set-Cookie:</code> HTTP header.
+<li>The <code>http.client</code> module implements a low-level library that can request <abbr>HTTP</abbr> resources and interpret <abbr>HTTP</abbr> responses.
+<li>The <code>http.cookies</code> module provides a Pythonic interface to browser cookies that are sent in a <code>Set-Cookie:</code> <abbr>HTTP</abbr> header.
 <li>The <code>http.cookiejar</code> module manipulates the actual files on disk that popular web browsers use to store cookies.
-<li>The <code>http.server</code> module provides a basic HTTP server.
+<li>The <code>http.server</code> module provides a basic <abbr>HTTP</abbr> server.
 </ol>
 <h3 id=urllib><code>urllib</code></h3>
 <p>Python 2 had a rat's nest of overlapping modules to parse, encode, and fetch URLs. In Python 3, these have all been refactored and combined in a single package, <code>urllib</code>.
@@ -319,15 +319,15 @@ from urllib2 import HTTPError</code></pre></td>
 from urllib.error import HTTPError</code></pre></td></tr>
 </table>
 <ol id=skipcompareimporturllib>
-<li>The old <code>urllib</code> module in Python 2 had a variety of functions, including <code>urlopen()</code> for fetching data and <code>splittype()</code>, <code>splithost()</code>, and <code>splituser()</code> for splitting a URL into its constituent parts. These functions have been reorganized more logically within the new <code>urllib</code> package. <code>2to3</code> will also change all calls to these functions so they use the new naming scheme.
+<li>The old <code>urllib</code> module in Python 2 had a variety of functions, including <code>urlopen()</code> for fetching data and <code>splittype()</code>, <code>splithost()</code>, and <code>splituser()</code> for splitting a <abbr>URL</abbr> into its constituent parts. These functions have been reorganized more logically within the new <code>urllib</code> package. <code>2to3</code> will also change all calls to these functions so they use the new naming scheme.
 <li>The old <code>urllib2</code> module in Python 2 has been folded into into the <code>urllib</code> package in Python 3. All your <code>urllib2</code> favorites &mdash; the <code>build_opener()</code> method, <code>Request</code> objects, and <code>HTTPBasicAuthHandler</code> and friends &mdash; are still available.
 <li>The <code>urllib.parse</code> module in Python 3 contains all the parsing functions from the old <code>urlparse</code> module in Python 2.
 <li>The <code>urllib.robotparser</code> module parses <a href=http://www.robotstxt.org/><code>robots.txt</code> files</a>.
-<li>The <code>FancyURLopener</code> class, which handles HTTP redirects and other status codes, is still available in the new <code>urllib.request</code> module. The <code>urlencode</code> function has moved to <code>urllib.parse</code>.
+<li>The <code>FancyURLopener</code> class, which handles <abbr>HTTP</abbr> redirects and other status codes, is still available in the new <code>urllib.request</code> module. The <code>urlencode</code> function has moved to <code>urllib.parse</code>.
 <li>The <code>Request</code> object is still available in <code>urllib.request</code>, but constants like <code>HTTPError</code> have been moved to <code>urllib.error</code>.
 </ol>
 <h3 id=dbm><code>dbm</code></h3>
-<p>All the various DBM clones are now in a single package, <code>dbm</code>. If you need a specific variant like GNU DBM, you can import the appropriate module within the <code>dbm</code> package.
+<p>All the various <abbr>DBM</abbr> clones are now in a single package, <code>dbm</code>. If you need a specific variant like <abbr>GNU</abbr> <abbr>DBM</abbr>, you can import the appropriate module within the <code>dbm</code> package.
 <p class=skip><a href=#skipcompareimportdbm>skip over this table</a>
 <table id=compareimportdbm>
 <tr><th>Notes</th>
@@ -353,7 +353,7 @@ import whichdb</code></pre></td>
 </table>
 <p id=skipcompareimportdbm>
 <h3 id=xmlrpc><code>xmlrpc</code></h3>
-<p>XML-RPC is a lightweight method of performing remote RPC calls over HTTP. The XML-RPC client library and several XML-RPC server implementations are now combined in a single package, <code>xmlrpc</code>.
+<p><abbr>XML-RPC</abbr> is a lightweight method of performing remote <abbr>RPC</abbr> calls over <abbr>HTTP</abbr>. The <abbr>XML-RPC</abbr> client library and several <abbr>XML-RPC</abbr> server implementations are now combined in a single package, <code>xmlrpc</code>.
 <p class=skip><a href=#skipcompareimportxmlrpc>skip over this table</a>
 <table id=compareimportxmlrpc>
 <tr><th>Notes</th>
@@ -417,14 +417,14 @@ except ImportError:
 <li>The <code>copyreg</code> module adds pickle support for custom types defined in C.
 <li>The <code>queue</code> module implements a multi-producer, multi-consumer queue.
 <li>The <code>socketserver</code> module provides generic base classes for implementing different kinds of socket servers.
-<li>The <code>configparser</code> module parses INI-style configuration files.
+<li>The <code>configparser</code> module parses <abbr>INI</abbr>-style configuration files.
 <li>The <code>reprlib</code> module reimplements the built-in <code>repr()</code> function, but with limits on how many values are represented.
 <li>The <code>subprocess</code> module allows you to spawn processes, connect to their pipes, and obtain their return codes.
 </ol>
 <h2 id=import>Relative imports within a package</h2>
 <p>A package is a group of related modules that function as a single entity. In Python 2, when modules within a package need to reference each other, you use <code>import foo</code> or <code>from foo import Bar</code>. The Python 2 interpreter first searches within the current package to find <code>foo.py</code>, and then moves on to the other directories in the Python search path (<code>sys.path</code>). Python 3 works a bit differently. Instead of searching the current package, it goes directly to the Python search path. If you want one module within a package to import another module in the same package, you need to explicitly provide the relative path between the two modules.
 <p>Suppose you had this package, with multiple files in the same directory:
-<p class=skip><a href=#skippackageart>skip over this ASCII art</a>
+<p class=skip><a href=#skippackageart>skip over this <abbr>ASCII</abbr> art</a>
 <pre>chardet/
 |
 +--__init__.py