Commit f4d7bc05 authored by WuHuan's avatar WuHuan

Merge pull request #1 from wbond/master

merge
parents 90d0ba44 8776094e
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
{ {
"name": "6to5", "name": "6to5",
"details": "https://github.com/6to5/6to5-sublime", "details": "https://github.com/6to5/6to5-sublime",
"labels": ["language syntax", "snippets"], "labels": ["language syntax", "snippets", "javascript"],
"releases": [ "releases": [
{ {
"sublime_text": "*", "sublime_text": "*",
......
...@@ -556,6 +556,17 @@ ...@@ -556,6 +556,17 @@
} }
] ]
}, },
{
"name": "ANSIescape",
"details": "https://github.com/aziz/SublimeANSI",
"labels": ["language syntax"],
"releases": [
{
"sublime_text": ">=3000",
"tags": true
}
]
},
{ {
"name": "Ant", "name": "Ant",
"details": "https://github.com/xeno-by/sublime-ant", "details": "https://github.com/xeno-by/sublime-ant",
...@@ -783,11 +794,11 @@ ...@@ -783,11 +794,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -700,11 +700,11 @@ ...@@ -700,11 +700,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -76,6 +76,17 @@ ...@@ -76,6 +76,17 @@
} }
] ]
}, },
{
"name": "C++YouCompleteMe",
"details": "https://github.com/glymehrvrd/CppYCM",
"labels": ["c++", "code completion", "syntax check"],
"releases": [
{
"sublime_text": ">=3000",
"tags": true
}
]
},
{ {
"name": "C0", "name": "C0",
"details": "https://github.com/mahmoudalismail/SublimeC0", "details": "https://github.com/mahmoudalismail/SublimeC0",
...@@ -331,6 +342,16 @@ ...@@ -331,6 +342,16 @@
} }
] ]
}, },
{
"name": "CFG Configuration Syntax Highlighting",
"details": "https://github.com/aronj/CFGGameConfigurationSyntax",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "cFos ml syntax", "name": "cFos ml syntax",
"details": "https://github.com/ArmorDarks/cfos-ml-syntax", "details": "https://github.com/ArmorDarks/cfos-ml-syntax",
...@@ -1931,6 +1952,16 @@ ...@@ -1931,6 +1952,16 @@
} }
] ]
}, },
{
"name": "Cortex",
"details": "https://github.com/Seldomberry/CortexIDE",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Cotonti", "name": "Cotonti",
"details": "https://github.com/Cotonti/sublime-cotonti", "details": "https://github.com/Cotonti/sublime-cotonti",
......
...@@ -527,6 +527,16 @@ ...@@ -527,6 +527,16 @@
} }
] ]
}, },
{
"name": "Django Starter",
"details": "https://github.com/geekpradd/Sublime-Django-Starter",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Django-DocsSearch", "name": "Django-DocsSearch",
"details": "https://github.com/saippuakauppias/sublime-text-2-Django-DocsSearch", "details": "https://github.com/saippuakauppias/sublime-text-2-Django-DocsSearch",
......
...@@ -16,6 +16,62 @@ ...@@ -16,6 +16,62 @@
} }
] ]
}, },
{
"name": "ordereddict",
"load_order": "50",
"description": "Python ordereddict module",
"author": "FichteFoll",
"issues": "https://github.com/packagecontrol/ordereddict/issues",
"releases": [
{
"base": "https://github.com/packagecontrol/ordereddict",
"tags": true,
"sublime_text": "<3000"
}
]
},
{
"name": "pytz",
"load_order": "50",
"description": "Python pytz module",
"author": "FichteFoll",
"issues": "https://github.com/packagecontrol/pytz/issues",
"releases": [
{
"base": "https://github.com/packagecontrol/pytz",
"tags": true,
"sublime_text": "*"
}
]
},
{
"name": "pyyaml",
"load_order": "50",
"description": "Python PyYAML module",
"author": "FichteFoll",
"issues": "https://github.com/packagecontrol/pyyaml/issues",
"releases": [
{
"base": "https://github.com/packagecontrol/pyyaml",
"tags": true,
"sublime_text": "*"
}
]
},
{
"name": "requests",
"load_order": "50",
"description": "Python requests module",
"author": "FichteFoll",
"issues": "https://github.com/packagecontrol/requests/issues",
"releases": [
{
"base": "https://github.com/packagecontrol/requests",
"tags": true,
"sublime_text": "*"
}
]
},
{ {
"name": "select-windows", "name": "select-windows",
"load_order": "02", "load_order": "02",
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -747,11 +747,11 @@ ...@@ -747,11 +747,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -157,11 +157,11 @@ ...@@ -157,11 +157,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
{ {
"name": "FileBrowser", "name": "FileBrowser",
"details": "https://github.com/aziz/SublimeFileBrowser", "details": "https://github.com/aziz/SublimeFileBrowser",
"labels": ["file navigation", "file creation", "file open"], "labels": ["file navigation", "file creation", "file open", "sidebar"],
"releases": [ "releases": [
{ {
"sublime_text": "*", "sublime_text": "*",
...@@ -330,6 +330,17 @@ ...@@ -330,6 +330,17 @@
} }
] ]
}, },
{
"name": "FileCommands",
"details": "https://github.com/tuvistavie/sublime-file-commands",
"labels": ["file navigation", "utilities"],
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "FileDialog", "name": "FileDialog",
"details": "https://github.com/shagabutdinov/sublime-file-dialog", "details": "https://github.com/shagabutdinov/sublime-file-dialog",
...@@ -508,7 +519,7 @@ ...@@ -508,7 +519,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -661,6 +672,16 @@ ...@@ -661,6 +672,16 @@
} }
] ]
}, },
{
"name": "Flask Starter",
"details": "https://github.com/geekpradd/Sublime-Flask-Starter",
"releases": [
{
"sublime_text": ">=3000",
"tags": true
}
]
},
{ {
"name": "Flatron", "name": "Flatron",
"details": "https://github.com/NoahBuscher/Flatron", "details": "https://github.com/NoahBuscher/Flatron",
...@@ -1048,11 +1069,11 @@ ...@@ -1048,11 +1069,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -261,6 +261,25 @@ ...@@ -261,6 +261,25 @@
} }
] ]
}, },
{
"name": "Git Commit Message Syntax",
"details": "https://github.com/adambullmer/sublime_git_commit_syntax",
"labels": [
"git",
"language",
"syntax",
"syntax highlighting",
"commit"
],
"author": "adambullmer",
"readme": "https://raw.githubusercontent.com/adambullmer/sublime_git_commit_syntax/master/README.md",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Git Config", "name": "Git Config",
"details": "https://github.com/robballou/gitconfig-sublimetext", "details": "https://github.com/robballou/gitconfig-sublimetext",
......
...@@ -291,11 +291,11 @@ ...@@ -291,11 +291,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -447,6 +447,16 @@ ...@@ -447,6 +447,16 @@
} }
] ]
}, },
{
"name": "Interpol",
"details": "https://github.com/kode4food/interpol-sublime",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "InterSystems Cache", "name": "InterSystems Cache",
"details": "https://github.com/brandonhorst/SublimeCache", "details": "https://github.com/brandonhorst/SublimeCache",
......
...@@ -333,6 +333,17 @@ ...@@ -333,6 +333,17 @@
} }
] ]
}, },
{
"name": "JDebug",
"details": "https://github.com/jdebug/JDebug",
"labels": ["debugger", "Java debugger", "java", "JDB"],
"releases": [
{
"sublime_text": ">=3000",
"tags": true
}
]
},
{ {
"name": "Jdf - Tool", "name": "Jdf - Tool",
"details": "https://github.com/wshxbqq/JdfSublime", "details": "https://github.com/wshxbqq/JdfSublime",
......
...@@ -820,6 +820,17 @@ ...@@ -820,6 +820,17 @@
} }
] ]
}, },
{
"name": "Mithrilizer",
"details": "https://github.com/Bondifrench/Mithrilizer",
"labels": ["javascript", "auto-complete", "Mithril", "snippets"],
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "MivaScript", "name": "MivaScript",
"details": "https://github.com/zquintana/SublimeMivaScript", "details": "https://github.com/zquintana/SublimeMivaScript",
......
...@@ -223,6 +223,17 @@ ...@@ -223,6 +223,17 @@
} }
] ]
}, },
{
"name": "ng-annotate Buildsystem",
"details": "https://github.com/ctf0/ng-annotate_Buildsystem",
"labels": ["build system"],
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "ngdoc snippets", "name": "ngdoc snippets",
"details": "https://github.com/iamsebastian/sublime-ngdoc-snippets", "details": "https://github.com/iamsebastian/sublime-ngdoc-snippets",
......
...@@ -87,6 +87,17 @@ ...@@ -87,6 +87,17 @@
} }
] ]
}, },
{
"name": "Oceanic Next Color Scheme",
"details": "https://github.com/voronianski/oceanic-next-theme",
"labels": ["color scheme", "javascript"],
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Oddly", "name": "Oddly",
"details": "https://github.com/laktak/sublime-oddly", "details": "https://github.com/laktak/sublime-oddly",
......
...@@ -928,7 +928,7 @@ ...@@ -928,7 +928,7 @@
{ {
"name": "PlainNotes", "name": "PlainNotes",
"details": "https://github.com/aziz/PlainNotes", "details": "https://github.com/aziz/PlainNotes",
"labels": ["notes", "note taking", "todo"], "labels": ["notes", "note taking", "authoring", "todo", "tasks"],
"releases": [ "releases": [
{ {
"sublime_text": "*", "sublime_text": "*",
...@@ -938,6 +938,7 @@ ...@@ -938,6 +938,7 @@
}, },
{ {
"details": "https://github.com/aziz/PlainTasks", "details": "https://github.com/aziz/PlainTasks",
"labels": ["todo", "tasks"],
"releases": [ "releases": [
{ {
"sublime_text": "*", "sublime_text": "*",
...@@ -1422,7 +1423,7 @@ ...@@ -1422,7 +1423,7 @@
}, },
{ {
"name": "Protocol Buffer Syntax", "name": "Protocol Buffer Syntax",
"details": "https://github.com/awalterschulze/sublime-protobuf-syntax", "details": "https://github.com/vihangm/sublime-protobuf-syntax",
"labels": ["language syntax"], "labels": ["language syntax"],
"releases": [ "releases": [
{ {
...@@ -1842,7 +1843,7 @@ ...@@ -1842,7 +1843,7 @@
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"platforms": "windows", "platforms": "windows",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -11,6 +11,16 @@ ...@@ -11,6 +11,16 @@
} }
] ]
}, },
{
"name": "QMakeProject",
"details": "https://github.com/nsubiron/sublime-qmakeproject-syntax",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "QML", "name": "QML",
"details": "https://github.com/skozlovf/Sublime-QML", "details": "https://github.com/skozlovf/Sublime-QML",
...@@ -111,7 +121,7 @@ ...@@ -111,7 +121,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -512,11 +512,11 @@ ...@@ -512,11 +512,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -299,11 +299,11 @@ ...@@ -299,11 +299,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -782,11 +782,11 @@ ...@@ -782,11 +782,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -889,17 +889,6 @@ ...@@ -889,17 +889,6 @@
} }
] ]
}, },
{
"name": "Shell Command",
"details": "https://github.com/markbirbeck/sublime-text-shell-command",
"labels": ["shell", "emacs"],
"releases": [
{
"sublime_text": ">=3000",
"tags": true
}
]
},
{ {
"name": "Shell Turtlestein", "name": "Shell Turtlestein",
"details": "https://github.com/misfo/Shell-Turtlestein", "details": "https://github.com/misfo/Shell-Turtlestein",
...@@ -914,6 +903,18 @@ ...@@ -914,6 +903,18 @@
} }
] ]
}, },
{
"name": "ShellCommand",
"details": "https://github.com/markbirbeck/sublime-text-shell-command",
"labels": ["shell", "emacs"],
"previous_names": ["Shell Command"],
"releases": [
{
"sublime_text": ">=3000",
"tags": true
}
]
},
{ {
"name": "ShellStatus", "name": "ShellStatus",
"details": "https://github.com/shagabutdinov/sublime-shell-status", "details": "https://github.com/shagabutdinov/sublime-shell-status",
...@@ -1195,6 +1196,16 @@ ...@@ -1195,6 +1196,16 @@
} }
] ]
}, },
{
"name": "SingularitySnippets",
"details": "https://github.com/blcook223/SingularitySnippets",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Sinon", "name": "Sinon",
"details": "https://github.com/mokkabonna/sublime-sinon", "details": "https://github.com/mokkabonna/sublime-sinon",
...@@ -2367,7 +2378,7 @@ ...@@ -2367,7 +2378,7 @@
"details": "https://github.com/mavidser/SublimeInput", "details": "https://github.com/mavidser/SublimeInput",
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": "*",
"tags": true "tags": true
} }
] ]
...@@ -2902,7 +2913,7 @@ ...@@ -2902,7 +2913,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -216,6 +216,16 @@ ...@@ -216,6 +216,16 @@
} }
] ]
}, },
{
"name": "Tera Term Language",
"details": "https://bitbucket.org/tkyjhr/st_teraterm",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Term Presenter", "name": "Term Presenter",
"details": "https://github.com/fd/term-presenter-sublime", "details": "https://github.com/fd/term-presenter-sublime",
...@@ -378,11 +388,11 @@ ...@@ -378,11 +388,11 @@
"releases": [ "releases": [
{ {
"sublime_text": "<3000", "sublime_text": "<3000",
"branch": "ST2" "tags": "st2-"
}, },
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "ST3" "tags": "st3-"
} }
] ]
}, },
...@@ -453,6 +463,17 @@ ...@@ -453,6 +463,17 @@
} }
] ]
}, },
{
"name": "Theme - Carmesim",
"details": "https://github.com/sergiokopplin/carmesim",
"labels": ["theme"],
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Theme - Centurion", "name": "Theme - Centurion",
"details": "https://github.com/allanhortle/Centurion", "details": "https://github.com/allanhortle/Centurion",
...@@ -654,6 +675,17 @@ ...@@ -654,6 +675,17 @@
} }
] ]
}, },
{
"name": "Theme - LP",
"details": "https://github.com/dubeg/theme-lp",
"labels": ["theme"],
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Theme - Lyte", "name": "Theme - Lyte",
"details": "https://github.com/lytedev/lyte-theme", "details": "https://github.com/lytedev/lyte-theme",
...@@ -866,6 +898,17 @@ ...@@ -866,6 +898,17 @@
} }
] ]
}, },
{
"name": "Theme - Solarized Space",
"details": "https://github.com/nsubiron/sublime-theme-solarized-space",
"labels": ["theme"],
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "Theme - Spacefunk", "name": "Theme - Spacefunk",
"details": "https://github.com/Twiebie/ST-Spacefunk", "details": "https://github.com/Twiebie/ST-Spacefunk",
...@@ -948,7 +991,7 @@ ...@@ -948,7 +991,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "master" "tags": "st3-"
} }
] ]
}, },
...@@ -957,7 +1000,7 @@ ...@@ -957,7 +1000,7 @@
"releases": [ "releases": [
{ {
"sublime_text": ">=3000", "sublime_text": ">=3000",
"branch": "master" "tags": "st3-"
} }
] ]
}, },
......
...@@ -34,6 +34,16 @@ ...@@ -34,6 +34,16 @@
} }
] ]
}, },
{
"name": "Yara syntax highlighting and snippet",
"details": "https://github.com/nyx0/yara",
"releases": [
{
"sublime_text": "*",
"tags": true
}
]
},
{ {
"name": "yardgen", "name": "yardgen",
"details": "https://bitbucket.org/fappelman/yardgen", "details": "https://bitbucket.org/fappelman/yardgen",
......
...@@ -27,6 +27,7 @@ if sys.version_info >= (3,): ...@@ -27,6 +27,7 @@ if sys.version_info >= (3,):
generator_method_type = 'method' generator_method_type = 'method'
str_cls = str str_cls = str
else: else:
from . import unittest_compat
from urlparse import urljoin from urlparse import urljoin
from urllib2 import HTTPError, urlopen from urllib2 import HTTPError, urlopen
generator_method_type = 'instancemethod' generator_method_type = 'instancemethod'
......
import sys
import re import re
import unittest import unittest
def assertIn(self, member, container, msg=None): if sys.version_info < (2, 7):
"""Just like self.assertTrue(a in b), but with a nicer default message.""" def assertIn(self, member, container, msg=None):
if member not in container: """Just like self.assertTrue(a in b), but with a nicer default message."""
if not msg: if member not in container:
msg = '%r not found in %r' % (member, container) if not msg:
self.fail(msg) msg = '%r not found in %r' % (member, container)
unittest.TestCase.assertIn = assertIn self.fail(msg)
unittest.TestCase.assertIn = assertIn
def assertNotIn(self, member, container, msg=None):
"""Just like self.assertTrue(a not in b), but with a nicer default message.""" def assertNotIn(self, member, container, msg=None):
if member in container: """Just like self.assertTrue(a not in b), but with a nicer default message."""
if not msg: if member in container:
msg = '%s unexpectedly found in %s' % (member, if not msg:
container) msg = '%s unexpectedly found in %s' % (member,
self.fail(msg) container)
unittest.TestCase.assertNotIn = assertNotIn self.fail(msg)
unittest.TestCase.assertNotIn = assertNotIn
def assertGreater(self, a, b, msg=None):
"""Just like self.assertTrue(a > b), but with a nicer default message.""" def assertGreater(self, a, b, msg=None):
if not a > b: """Just like self.assertTrue(a > b), but with a nicer default message."""
if not msg: if not a > b:
msg = '%s not greater than %s' % (a, b) if not msg:
self.fail(msg) msg = '%s not greater than %s' % (a, b)
unittest.TestCase.assertGreater = assertGreater self.fail(msg)
unittest.TestCase.assertGreater = assertGreater
def assertRegexpMatches(self, text, expected_regexp, msg=None):
"""Fail the test unless the text matches the regular expression.""" def assertRegexpMatches(self, text, expected_regexp, msg=None):
if isinstance(expected_regexp, basestring): """Fail the test unless the text matches the regular expression."""
expected_regexp = re.compile(expected_regexp) if isinstance(expected_regexp, basestring):
if not expected_regexp.search(text): expected_regexp = re.compile(expected_regexp)
msg = msg or "Regexp didn't match" if not expected_regexp.search(text):
msg = '%s: %r not found in %r' % (msg, expected_regexp.pattern, text) msg = msg or "Regexp didn't match"
raise self.failureException(msg) msg = '%s: %r not found in %r' % (msg, expected_regexp.pattern, text)
unittest.TestCase.assertRegex = assertRegexpMatches raise self.failureException(msg)
unittest.TestCase.assertRegex = assertRegexpMatches
def assertNotRegexpMatches(self, text, unexpected_regexp, msg=None):
"""Fail the test if the text matches the regular expression.""" def assertNotRegexpMatches(self, text, unexpected_regexp, msg=None):
if isinstance(unexpected_regexp, basestring): """Fail the test if the text matches the regular expression."""
unexpected_regexp = re.compile(unexpected_regexp) if isinstance(unexpected_regexp, basestring):
match = unexpected_regexp.search(text) unexpected_regexp = re.compile(unexpected_regexp)
if match: match = unexpected_regexp.search(text)
msg = msg or "Regexp matched" if match:
msg = '%s: %r matches %r in %r' % (msg, msg = msg or "Regexp matched"
text[match.start():match.end()], msg = '%s: %r matches %r in %r' % (msg,
unexpected_regexp.pattern, text[match.start():match.end()],
text) unexpected_regexp.pattern,
raise self.failureException(msg) text)
unittest.TestCase.assertNotRegex = assertNotRegexpMatches raise self.failureException(msg)
unittest.TestCase.assertNotRegex = assertNotRegexpMatches
def assertIsInstance(self, obj, cls, msg=None):
"""Same as self.assertTrue(isinstance(obj, cls)), with a nicer def assertIsInstance(self, obj, cls, msg=None):
default message.""" """Same as self.assertTrue(isinstance(obj, cls)), with a nicer
if not isinstance(obj, cls): default message."""
if not msg: if not isinstance(obj, cls):
msg = '%s is not an instance of %r' % (obj, cls) if not msg:
self.fail(msg) msg = '%s is not an instance of %r' % (obj, cls)
unittest.TestCase.assertIsInstance = assertIsInstance self.fail(msg)
unittest.TestCase.assertIsInstance = assertIsInstance
else:
unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
unittest.TestCase.assertNotRegex = unittest.TestCase.assertNotRegexpMatches
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment