fixes from dan

cewing · cewing · commit 0415ac0f2f5a · 2013-01-21T20:44:24.000-08:00
diff --git a/source/presentations/week03.rst b/source/presentations/week03.rst
@@ -152,9 +152,9 @@ it supports standard file read operations:
 .. code-block:: python
 
     >>> html = page.read()
-    >>> len(page)
+    >>> len(html)
     373447
-    >>> print page
+    >>> print html
 
     <!DOCTYPE html PUBLIC
       "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -182,7 +182,7 @@ Brief Interlude
 
 .. class:: big-centered
 
-"Some people, when confronted with a problem, think 'I know, I'ʹll use regular
+"Some people, when confronted with a problem, think 'I know, I'll use regular
 expressions.' Now they have two problems."
 
 Even Better
@@ -265,9 +265,9 @@ Creating a new virtualenv is very very simple::
 <ENV> is just the name of the environment you want to create. It's arbitrary.
 Let's make one for our BeautifulSoup install::
 
-    $ python virtualanv.py --distribute soupenv
-    New python executable in fooenv/bin/python2.6
-    Also creating executable in fooenv/bin/python
+    $ python virtualenv.py --distribute soupenv
+    New python executable in soupenv/bin/python2.6
+    Also creating executable in soupenv/bin/python
     Installing distribute........................
     .............................................
     ...done.
@@ -280,7 +280,7 @@ When you ran that file, a couple of things took place:
 .. class:: incremental
 
 * A new directory with your requested name was created
-* A new Python executable was created in <ENV>/bin
+* A new Python executable was created in <ENV>/bin (<ENV>/Scripts on Windows)
 * The new Python was cloned from the Python used to run the file
 * The new Python was isolated from any libraries installed in the old Python
 * Distribute (a newer, better setuptools) was installed so you have ``easy_install``
@@ -445,20 +445,22 @@ Testing it out
 
 .. code-block:: python
 
-    >>> for e in entries:
-    ...     anchor = e.find('a')
-    ...     paragraph = e.find('p', 'discreet')
-    ...     title = anchor.text.strip()
-    ...     url = anchor.attrs['href']
-    ...     print title
-    ...     print url
-    ...     try:
-    ...         print paragraph.text.strip()
-    ...     except AttributeError:
-    ...         print 'Uncategorized'
-    ...     print
-    ...     
-    >>>
+    for e in entries:
+        anchor = e.find('a')
+        paragraph = e.find('p', 'discreet')
+        title = anchor.text.strip()
+        url = anchor.attrs['href']
+        print title
+        print url
+        try:
+            print paragraph.text.strip()
+        except AttributeError:
+            print 'Uncategorized'
+        print
+
+.. class:: incremental
+
+Watch for unicode encoding errors, I don't get any, but you might.
 
 Lab 1 - 20 mins
 ---------------
@@ -477,6 +479,18 @@ Lab 1 - 20 mins
 
 **GO**
 
+Short Break
+-----------
+
+While you are taking a short break, you might take a moment to sign up for 
+the geocoding service we'll use later:
+
+http://geoservices.tamu.edu/UserServices/Signup.aspx
+
+You can also view your profile once you've signed up:
+
+http://geoservices.tamu.edu/UserServices/Profile/ViewProfile.aspx
+
 Another Approach
 ----------------
 
@@ -575,7 +589,7 @@ we also allow *calling procedures* at an endpoint?
 
 .. class:: incremental
 
-We can!  Enter XML-RPC
+We can!  Enter XML-RPC (Remote Procedure Call)
 
 .. class:: incremental
 
@@ -730,8 +744,8 @@ First, implement required methods on your service class:
             f = getattr(self, method)
             return f.__doc__
 
-XML-RPC Instrospection
-----------------------
+XML-RPC Introspection
+---------------------
 
 Then enable introspection via the server instance:
 
@@ -754,6 +768,26 @@ your service offers:
     public_method
         this method is public
 
+Introspection Question
+----------------------
+
+I told you when we added the ``_private_method`` that any method that any
+method whose name starts with ``_`` would be **private**.
+
+.. class:: incremental
+
+But we also added a ``_listMethods`` method and a ``_methodHelp`` method and
+*those* methods are listed when you run ``proxy.system.listMethods()``
+
+.. class:: incremental
+
+Why is this?
+
+.. class:: incremental
+
+For a complete discussion of this, read `this MOTW post`_
+
+.. _this MOTW post: http://www.doughellmann.com/PyMOTW/SimpleXMLRPCServer/index.html#introspection-api
 
 Beyond XML-RPC
 --------------
@@ -896,17 +930,17 @@ required according to api documentation, it is safest to provide them all:
 .. code-block:: python
     :class: small
 
-    >>> apiKey = '<fill this in>'
-    >>> args = {'apiKey': apiKey, }
-    >>> args['streetAddress'] = '1325 4th Avenue'
-    >>> args['city'] = 'Seattle'
-    >>> args['state'] = 'WA'
-    >>> args['zip'] = '98101'
-    >>> args['version'] = 3.01
-    >>> args['shouldReturnReferenceGeometry'] = True
-    >>> args['shouldNotStoreTransactionDetails'] = True
-    >>> args['shouldCalculateCensus'] = False
-    >>> args['censusYear'] = "TwoThousandTen"
+    apiKey = '<fill this in>'
+    args = {'apiKey': apiKey, }
+    args['streetAddress'] = '1325 4th Avenue'
+    args['city'] = 'Seattle'
+    args['state'] = 'WA'
+    args['zip'] = '98101'
+    args['version'] = 3.01
+    args['shouldReturnReferenceGeometry'] = True
+    args['shouldNotStoreTransactionDetails'] = True
+    args['shouldCalculateCensus'] = False
+    args['censusYear'] = "TwoThousandTen"
 
 Making the Call
 ---------------
@@ -1074,11 +1108,11 @@ pythonic, no?
 JSON Data Types
 ---------------
 
-JSON provides a few basic data types:
+JSON provides a few basic data types (see http://json.org/):
 
 .. class:: incremental
 
-* string: unicode, anything but '"', '\' and control chars
+* string: unicode, anything but ", \\ and control characters
 * number: any number, but json does not use octal or hexidecimal
 * object, array (we've seen these above)
 * true
@@ -1126,7 +1160,7 @@ You can encode python to json, and decode json back to python:
     >>> array = [1,2,3]
     >>> json.dumps(array)
     >>> orig = {'foo': [1,2,3], 'bar': u'my resumé', 'baz': True}
-    >>> encoded = json.dumps(dict_)
+    >>> encoded = json.dumps(orig)
     >>> encoded
     '{"baz": true, "foo": [1, 2, 3], "bar": "my resum\\u00e9"}'
     >>> decoded = json.loads(encoded)
