From 75ca4ea6e1416d87745298ca7b57bb3cbd95376a Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 6 May 2008 23:48:04 +0000 Subject: Merged revisions 62792,62799-62800 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62792 | brett.cannon | 2008-05-07 01:22:02 +0200 (Wed, 07 May 2008) | 2 lines When testing a module's __all__, we really don't care if it is deprecated. ........ r62799 | christian.heimes | 2008-05-07 01:42:58 +0200 (Wed, 07 May 2008) | 1 line Disabled some unit tests for the upcoming release. See #2777 ........ r62800 | brett.cannon | 2008-05-07 01:44:04 +0200 (Wed, 07 May 2008) | 2 lines Create a TextMate directory in Misc to house a Python-Dev bundle. ........ --- Lib/test/test___all__.py | 17 ++++++---- Lib/test/test_subprocess.py | 12 +++---- .../Commands/2 to 3 - Module Deletion.tmCommand | 38 ++++++++++++++++++++++ .../Commands/Build Docs.tmCommand | 23 +++++++++++++ .../Python-Dev.tmbundle/Commands/Build.tmCommand | 25 ++++++++++++++ .../Commands/Go to Issue.tmCommand | 20 ++++++++++++ .../Commands/Open Docs.tmCommand | 32 ++++++++++++++++++ .../Commands/Open PEP.tmCommand | 23 +++++++++++++ Misc/TextMate/Python-Dev.tmbundle/info.plist | 33 +++++++++++++++++++ 9 files changed, 210 insertions(+), 13 deletions(-) create mode 100644 Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand create mode 100644 Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand create mode 100644 Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand create mode 100644 Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand create mode 100644 Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand create mode 100644 Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand create mode 100644 Misc/TextMate/Python-Dev.tmbundle/info.plist diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index a2a2519..d88c400 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -1,18 +1,21 @@ import unittest -from test.test_support import run_unittest +from test.test_support import run_unittest, catch_warning import sys +import warnings class AllTest(unittest.TestCase): def check_all(self, modname): names = {} - try: - exec("import %s" % modname, names) - except ImportError: - # Silent fail here seems the best route since some modules - # may not be available in all environments. - return + with catch_warning(): + warnings.filterwarnings("ignore", ".* module", DeprecationWarning) + try: + exec("import %s" % modname, names) + except ImportError: + # Silent fail here seems the best route since some modules + # may not be available in all environments. + return self.failUnless(hasattr(sys.modules[modname], "__all__"), "%s has no __all__ attribute" % modname) names = {} diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 98a9e44..3d6777f 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -584,7 +584,7 @@ class ProcessTestCase(unittest.TestCase): os.remove(fname) self.assertEqual(rc, 47) - def test_send_signal(self): + def DISABLED_test_send_signal(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) @@ -592,7 +592,7 @@ class ProcessTestCase(unittest.TestCase): p.send_signal(signal.SIGINT) self.assertNotEqual(p.wait(), 0) - def test_kill(self): + def DISABLED_test_kill(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) @@ -600,7 +600,7 @@ class ProcessTestCase(unittest.TestCase): p.kill() self.assertEqual(p.wait(), -signal.SIGKILL) - def test_terminate(self): + def DISABLED_test_terminate(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) @@ -678,7 +678,7 @@ class ProcessTestCase(unittest.TestCase): ' -c "import sys; sys.exit(47)"') self.assertEqual(rc, 47) - def test_send_signal(self): + def DISABLED_test_send_signal(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) @@ -686,7 +686,7 @@ class ProcessTestCase(unittest.TestCase): p.send_signal(signal.SIGTERM) self.assertNotEqual(p.wait(), 0) - def test_kill(self): + def DISABLED_test_kill(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) @@ -694,7 +694,7 @@ class ProcessTestCase(unittest.TestCase): p.kill() self.assertNotEqual(p.wait(), 0) - def test_terminate(self): + def DISABLED_test_terminate(self): p = subprocess.Popen([sys.executable, "-c", "input()"]) diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand new file mode 100644 index 0000000..31b8837 --- /dev/null +++ b/Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand @@ -0,0 +1,38 @@ + + + + + beforeRunningCommand + nop + command + #!/usr/bin/python + +template = """from warnings import warnpy3k +warnpy3k("the ${1:%s} module has been removed in Python 3.0", stacklevel=2) +del warnpy3k +$0""" + +import imp +import os + +file_name = os.path.split(os.environ['TM_FILEPATH'])[1] +for suffix in (tuple_[0] for tuple_ in imp.get_suffixes()): + if not file_name.endswith(suffix): + continue + module_name = file_name[:-len(suffix)] + print (template % module_name), + break +else: + print (template % "XXX"), + input + none + name + 2 to 3 - Module Deletion + output + insertAsSnippet + tabTrigger + 2to3moddel + uuid + 9519C22B-6AB8-41A1-94F6-079E0B45C147 + + diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand new file mode 100644 index 0000000..7e4d53b --- /dev/null +++ b/Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand @@ -0,0 +1,23 @@ + + + + + beforeRunningCommand + nop + command + # XXX Leopard-specific unless have easy way to specific alternative Python executable. + +cd $TM_PROJECT_DIRECTORY/Doc +make html 2>&1 | pre + +rescan_project + input + none + name + Build Docs + output + showAsHTML + uuid + 6EF151E5-7149-4F82-8796-0CC40FE589FA + + diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand new file mode 100644 index 0000000..6ffda5c --- /dev/null +++ b/Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand @@ -0,0 +1,25 @@ + + + + + beforeRunningCommand + nop + command + # XXX TODO +# - Highlight any compiler warnings for Python code. +# - Point out if compile failed. + +cd $TM_PROJECT_DIRECTORY +make -s -j2 2>&1 | pre + +rescan_project + input + none + name + Build Python + output + showAsHTML + uuid + B545BB1B-A8E1-426C-B50A-426E78B96D38 + + diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand new file mode 100644 index 0000000..65d30bc --- /dev/null +++ b/Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand @@ -0,0 +1,20 @@ + + + + + beforeRunningCommand + nop + command + open "http://bugs.python.org/issue$(cat)" + fallbackInput + word + input + selection + name + Go to Issue + output + discard + uuid + FD25A8DC-22DC-4ED4-B222-B943C8A9117D + + diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand new file mode 100644 index 0000000..501be43 --- /dev/null +++ b/Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand @@ -0,0 +1,32 @@ + + + + + beforeRunningCommand + nop + command + # Search order: +# - Current project. +# - TM_PYTHONDEV_DOCS. +# - Online docs in development. + +html_index=$TM_PROJECT_DIRECTORY/Doc/build/html/index.html +if [[ -f $html_index ]]; then + open $html_index +elif [[ $TM_PYTHONDEV_DOCS ]]; then + open $TM_PYTHONDEV_DOCS +else + open http://docs.python.org/dev/ +fi + input + none + keyEquivalent + @H + name + Open Docs + output + discard + uuid + BF336FFF-E14D-4BF1-A156-71CF768AC034 + + diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand new file mode 100644 index 0000000..af5533a --- /dev/null +++ b/Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand @@ -0,0 +1,23 @@ + + + + + beforeRunningCommand + nop + command + # XXX Worth supporting using a local copy? + +# Dumb luck that an unrecognized number leads to a 0 being used. +open `printf "http://www.python.org/dev/peps/pep-%04d" $(cat)` + fallbackInput + word + input + selection + name + Open PEP + output + discard + uuid + EDBB037F-AAE3-4512-863F-D9AA82C9E51E + + diff --git a/Misc/TextMate/Python-Dev.tmbundle/info.plist b/Misc/TextMate/Python-Dev.tmbundle/info.plist new file mode 100644 index 0000000..2e0ea9a --- /dev/null +++ b/Misc/TextMate/Python-Dev.tmbundle/info.plist @@ -0,0 +1,33 @@ + + + + + mainMenu + + items + + 9519C22B-6AB8-41A1-94F6-079E0B45C147 + ------------------------------------ + B545BB1B-A8E1-426C-B50A-426E78B96D38 + 6EF151E5-7149-4F82-8796-0CC40FE589FA + ------------------------------------ + BF336FFF-E14D-4BF1-A156-71CF768AC034 + FD25A8DC-22DC-4ED4-B222-B943C8A9117D + EDBB037F-AAE3-4512-863F-D9AA82C9E51E + + submenus + + + name + Python-Dev + ordering + + B545BB1B-A8E1-426C-B50A-426E78B96D38 + 6EF151E5-7149-4F82-8796-0CC40FE589FA + FD25A8DC-22DC-4ED4-B222-B943C8A9117D + BF336FFF-E14D-4BF1-A156-71CF768AC034 + + uuid + A932ECD1-D43A-4F57-B7FB-A1CEC3B65D20 + + -- cgit v0.12