merging jarko'S fixes, resolves issue #45, resolves issue #46

--HG--
branch : trunk

doc/changelog.txt

@@ -1,6 +1,8 @@
 Changes between 1.0.x and 'trunk'
 =====================================
 
+* merge Jarko's fixes, issue #45 and #46
+
 * add the ability to specify a path for py.lookup to search in
 
 * fix a funcarg cached_setup bug probably only occuring 

doc/test/quickstart.txt

@@ -23,7 +23,7 @@ Now create a file ``test_sample.py`` with the following content:
     def func(x):
         return x + 1
     def test_answer():
-        assert f(3) == 5
+        assert func(3) == 5
 
 You can now run the test file like this::
 

py/bin/env.py

@@ -3,7 +3,7 @@
 import sys, os, os.path
 
 progpath = sys.argv[0]
-packagedir = os.path.abspath(os.path.dirname(progpath))
+packagedir = os.path.dirname(os.path.dirname(os.path.abspath(progpath)))
 packagename = os.path.basename(packagedir)
 bindir = os.path.join(packagedir, 'bin')
 if sys.platform == 'win32':

py/error.py

@@ -74,7 +74,7 @@ class ErrorMaker(object):
                 cls = self._geterrnoclass(errno)
             else: 
                 try: 
-                    cls = self._geterrnoclass(_winerrnomap[eno]) 
+                    cls = self._geterrnoclass(_winerrnomap[errno]) 
                 except KeyError:    
                     raise value 
             raise cls("%s%r" % (func.__name__, args))