Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
+42
View File
@@ -0,0 +1,42 @@
$NetBSD: patch-ba,v 1.1 2012/12/17 11:57:44 drochner Exp $
--- IPython/utils/tests/test_process.py.orig 2011-12-19 01:25:33.000000000 +0000
+++ IPython/utils/tests/test_process.py
@@ -102,30 +102,30 @@ class SubProcessTestCase(TestCase, tt.Te
self.mktmp('\n'.join(lines))
def test_system(self):
- status = system('python "%s"' % self.fname)
+ status = system('"%s" "%s"' % (sys.executable, self.fname))
self.assertEquals(status, 0)
def test_system_quotes(self):
- status = system('python -c "import sys"')
+ status = system('"%s" -c "import sys"' % sys.executable)
self.assertEquals(status, 0)
def test_getoutput(self):
- out = getoutput('python "%s"' % self.fname)
+ out = getoutput('"%s" "%s"' % (sys.executable, self.fname))
self.assertEquals(out, 'on stdout')
def test_getoutput_quoted(self):
- out = getoutput('python -c "print (1)"')
+ out = getoutput('"%s" -c "print (1)"' % sys.executable)
self.assertEquals(out.strip(), '1')
#Invalid quoting on windows
@dec.skip_win32
def test_getoutput_quoted2(self):
- out = getoutput("python -c 'print (1)'")
+ out = getoutput("'%s' -c 'print (1)'" % sys.executable)
self.assertEquals(out.strip(), '1')
- out = getoutput("python -c 'print (\"1\")'")
+ out = getoutput("'%s' -c 'print (\"1\")'" % sys.executable)
self.assertEquals(out.strip(), '1')
def test_getoutput(self):
- out, err = getoutputerror('python "%s"' % self.fname)
+ out, err = getoutputerror('"%s" "%s"' % (sys.executable, self.fname))
self.assertEquals(out, 'on stdout')
self.assertEquals(err, 'on stderr')
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-bb,v 1.1 2012/12/17 11:57:44 drochner Exp $
--- IPython/core/tests/test_interactiveshell.py.orig 2012-10-21 00:30:53.000000000 +0000
+++ IPython/core/tests/test_interactiveshell.py
@@ -399,7 +399,7 @@ class TestSystemRaw(unittest.TestCase):
def test_1(self):
"""Test system_raw with non-ascii cmd
"""
- cmd = ur'''python -c "'åäö'" '''
+ cmd = ur'''"%s" -c "'åäö'" ''' % sys.executable
ip.system_raw(cmd)
class TestModules(unittest.TestCase, tt.TempFileMixin):
@@ -0,0 +1,13 @@
$NetBSD: patch-setupbase.py,v 1.1 2012/12/17 11:57:44 drochner Exp $
--- setupbase.py.orig 2012-10-21 00:30:54.000000000 +0000
+++ setupbase.py
@@ -201,7 +201,7 @@ def find_data_files():
"""
docdirbase = pjoin('share', 'doc', 'ipython')
- manpagebase = pjoin('share', 'man', 'man1')
+ manpagebase = pjoin(os.environ.get('PKGMANDIR'), 'man1')
# Simple file lists can be made by hand
manpages = [f for f in glob(pjoin('docs','man','*.1.gz')) if isfile(f)]