p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

--HG--
branch : trunk
This commit is contained in:
holger krekel 2009-09-23 19:43:43 +02:00
parent 1e71a5c392 9fd1367845
commit 8f69d23f18
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/changelog.txt
View File

@ -1,6 +1,8 @@
Changes between 1.0.x and 'trunk' 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 * add the ability to specify a path for py.lookup to search in
* fix a funcarg cached_setup bug probably only occuring * fix a funcarg cached_setup bug probably only occuring

2
doc/test/quickstart.txt
View File

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

2
py/bin/env.py
View File

@ -3,7 +3,7 @@
import sys, os, os.path import sys, os, os.path
progpath = sys.argv[0] 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) packagename = os.path.basename(packagedir)
bindir = os.path.join(packagedir, 'bin') bindir = os.path.join(packagedir, 'bin')
if sys.platform == 'win32': if sys.platform == 'win32':

2
py/error.py
View File

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