Merge branch 'master' into master

.github/PULL_REQUEST_TEMPLATE.md

+Please provide the following information:
+
+ - Link to your code repository:
+ - Link to the tags page with at least one [semver](http://semver.org) tag: 
+
+Also make sure you:
+
+ 1. Used `"tags": true` and not `"branch": "master"` ([versioning docs](https://packagecontrol.io/docs/submitting_a_package#Step_4))
+ 2. Ran the tests ([tests docs](https://packagecontrol.io/docs/submitting_a_package#Step_7))

.gitignore

 .DS_Store
 *.pyc
+*.sublime-workspace

.travis.yml

+sudo: false
 language: python
 python:
   - "3.3"

package_control_channel.sublime-project

+{
+    "folders":
+    [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "ensure_newline_at_eof_on_save": true,
+        "translate_to_spaces": false,
+        "trim_trailing_white_space_on_save": true
+    },
+    "build_systems":
+    [
+        {
+            "name": "Run Tests",
+            "cmd": ["python", "-m", "unittest"],
+            "file_regex": "^\\s*File \"(.*?)\", line \\d+",
+            "working_dir": "${project_path:${folder}}",
+            "selector": "source.json, source.python"
+        }
+    ]
+}

readme.md

-# Sublime Package Control Default Channel
+# Package Control Default Channel
 
 The `channel.json`, `repository.json` and `repository/*.json` files contain a
 list of repositories and packages for use with
-[Package Control](https://sublime.wbond.net).
+[Package Control](https://packagecontrol.io).
 
-The `channel.json` file is published at https://sublime.wbond.net/channel.json
+The `channel.json` file is published at https://packagecontrol.io/channel_v3.json
 and is included with Package Control as the default channel.
 
-Please be sure to follow the instructions at
-https://sublime.wbond.net/docs/developers to help the process of adding your
-package or repository go smoothly.
+**Please be sure to follow the instructions at
+https://packagecontrol.io/docs/submitting_a_package to help the process of adding your
+package or repository go smoothly.**

repository.json

 {
-	"schema_version": "2.0",
+	"schema_version": "3.0.0",
 	"packages": [],
+	"dependencies": [],
 	"includes": [
 		"./repository/0-9.json",
 		"./repository/a.json",
@@ -28,6 +29,7 @@
 		"./repository/w.json",
 		"./repository/x.json",
 		"./repository/y.json",
-		"./repository/z.json"
+		"./repository/z.json",
+		"./repository/dependencies.json"
 	]
 }

repository/0-9.json

 {
-	"schema_version": "2.0",
+	"schema_version": "3.0.0",
 	"packages": [
+		{
+			"name": "1337 Color Scheme",
+			"details": "https://github.com/MarkMichos/1337-Scheme",
+			"labels": ["color scheme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "1Self",
+			"details": "https://github.com/1self/sublime-text-plugin",
+			"labels": ["time tracking", "activity"],
+			"previous_names": ["QuantifiedDev"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "2pdf",
 			"details": "https://github.com/fraoustin/Sublime2pdf",
 			"releases": [
 				{
 					"sublime_text": "<3000",
-					"details": "https://github.com/fraoustin/Sublime2pdf/tree/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -18,7 +41,29 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/idleberg/3024.tmTheme/tree/master"
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "3D Tool (Async Burst-Mode)",
+			"details": "https://github.com/leoheck/sublime-3d-tool/",
+			"labels": ["3d-tool", "burst-mode", "async"],
+			"previous_names": ["3D Tool Syntax Hilight"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "42 Headers",
+			"details": "https://github.com/Globidev/Sublime-Text-42-Headers",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
 				}
 			]
 		},
@@ -29,7 +74,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/skarcha/SublimeText2-4GL/tree/master"
+					"branch": "master"
 				}
 			]
 		}

repository/k.json

 {
-	"schema_version": "2.0",
+	"schema_version": "3.0.0",
 	"packages": [
+		{
+			"name": "K Framework",
+			"details": "https://github.com/Zhomart/kframework-Sublime-Plugin",
+			"labels": ["language syntax", "kframework"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "KABEMS",
+			"details": "https://github.com/konstantin24121/sublime-kabems",
+			"labels": ["KABEMS", "BEM", "syntax highlight"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Kahlan PHP Snippets",
+			"details": "https://github.com/geryguilbon/sublime_kahlan_snippets",
+			"labels": ["kahlan", "snippets", "tests", "tdd", "framework", "php"],
+			"author": "gguilbon",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KanaKana",
+			"details": "https://github.com/mitsu-ksgr/KanaKana",
+			"labels": ["japanese", "text manipulation"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Kaneva API (KPI) Completions",
+			"details": "https://github.com/FracturedShader/kpiCompletions",
+			"labels": ["completions", "Kaneva", "Lua"],
+			"previous_names": ["Kaneva API (KPI) Snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "KarmaRunner",
+			"details": "https://github.com/knee-cola/KarmaRunner",
+			"labels": ["Karma", "Jasmine"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Kconfig Syntax Highlight",
+			"details": "https://github.com/fallrisk/Kconfig-Highlighter",
+			"labels": ["Kconfig", "syntax highlight", "kernel config"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KCPS Theme",
+			"details": "https://github.com/KCPS/st3-theme-kcps",
+			"labels": ["KCPS", "text colour scheme", "user interface colour scheme"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Keep Open On Last Tab Close",
 			"details": "https://github.com/vprimachenko/Sublime2KeepOpen",
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/vprimachenko/Sublime2KeepOpen/tree/master"
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "Kellys Color Scheme",
+			"details": "https://github.com/maxhoffmann/Kellys",
+			"labels": ["color scheme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "Kerbal Space Program Configuration Syntax",
+			"details": "https://github.com/NathanJang/KSP-tmLanguage",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KeybindingHelper",
+			"details": "https://github.com/r-stein/sublime-text-keybinding-helper",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"tags": "st2-"
+				},
+				{
+					"sublime_text": ">=3000",
+					"tags": "st3-"
+				}
+			]
+		},
+		{
+			"name": "KeyboardSelection",
+			"details": "https://github.com/robertcollier4/keyboardSelectionSublime",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KeyboardSpellCheck",
+			"details": "https://github.com/jlknuth/KeyboardSpellCheck",
+			"labels": ["spell check", "vintage", "vi", "google"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KeymapEnhanced",
+			"details": "https://github.com/shagabutdinov/sublime-keymap-enhanced",
+			"donate": "https://github.com/shagabutdinov/sublime-enhanced/blob/master/readme-donations.md",
+			"labels": ["sublime-enhanced", "keymap"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"branch": "master"
 				}
 			]
 		},
@@ -16,7 +174,7 @@
 			"releases": [
 				{
 					"sublime_text": "<3000",
-					"details": "https://github.com/welefen/KeymapManager/tree/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -27,7 +185,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/MiroHibler/sublime-keymaps/tree/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -37,9 +195,19 @@
 			"labels": ["language syntax", "build system", "snippets"],
 			"releases": [
 				{
-					"sublime_text": ">=3000",
-					"platforms": ["osx", "windows"],
-					"details": "https://github.com/Swoffa/SublimeKickAssemblerC64/tags"
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Kickoff Snippets",
+			"details": "https://github.com/trykickoff/Kickoff-snippets",
+			"labels": ["completions", "html", "css", "sass", "js", "javascript"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
 				}
 			]
 		},
@@ -50,7 +218,41 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/idleberg/Kimbie.tmTheme/tree/master"
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "Kirby2 CMS Snippets",
+			"details": "https://github.com/mauricerenck/sublime-kirby2",
+			"labels": ["completions", "php", "snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Kivy Language",
+			"details": "https://github.com/ivlevdenis/kivylng",
+			"labels": ["auto-complete","build system","language syntax","snippets"],
+			"author": "ivlevdenis",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KIXtart",
+			"details": "https://github.com/vipex/KIXtart.tmLanguage",
+			"labels": ["language syntax", "build system", "snippets", "kix"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
 				}
 			]
 		},
@@ -61,7 +263,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/andrewheiss/SublimeKnitr/tags"
+					"tags": true
 				}
 			]
 		},
@@ -70,7 +272,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/aziz/knockdown/tree/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -79,7 +281,51 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/SublimeText/KnowledgeBase/tree/master"
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "Koala",
+			"details": "https://github.com/magneto538/Koala",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Koala - Snippets",
+			"details": "https://github.com/magneto538/Koala-snippets",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Kodery",
+			"details": "https://github.com/phuu/sublime.kodery",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KodiDevKit",
+			"details": "https://github.com/phil65/kodidevkit",
+			"author": "phil65",
+			"donate": "https://blockchain.info/de/address/1KzWm7XtW42gyZQqg5CqW6k9fb3zWinM15",
+			"labels": ["completions", "language syntax", "snippets", "auto-complete"],
+			"previous_names": ["SublimeKodi"],
+			"releases": [
+				{
+					"sublime_text": ">=3092",
+					"tags": true
 				}
 			]
 		},
@@ -89,7 +335,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/Zeelot/sublime-kohana/tree/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -100,7 +346,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/golf3gtiii/Kohana234-sublimeText2-plugin/tree/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -110,7 +356,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://bitbucket.org/temperedvision/sublime-kohana3/src/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -120,7 +366,18 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/koken/koken-sublime/tree/master"
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "KoLMafia ASH Syntax",
+			"details": "https://github.com/digitrev/KoLMafiaAshSyntax",
+			"labels": ["language syntax"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
 				}
 			]
 		},
@@ -130,7 +387,70 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/vkostyukov/kotlin-sublime-package/tree/master"
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "KRL (Kinetic Rule Language) Syntax",
+			"details": "https://github.com/drautb/krl-syntax",
+			"labels": ["language syntax"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KRL (Kinetic Rule Language) Validator",
+			"details": "https://github.com/trevordixon/sublime-krl-validator",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"branch": "master"
+				}
+			]
+		},
+		{
+			"name": "Kroman",
+			"details": "https://github.com/cheunghy/kroman-sublime",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "KSP (Kontakt Script Processor)",
+			"details": "https://github.com/nojanath/SublimeKSP",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "Kulture",
+			"details": "https://github.com/OmniSharp/Kulture",
+			"previous_names": ["vNext"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"branch": "release"
+				}
+			]
+		},
+		{
+			"name": "Kustom Color Schemes",
+			"details": "https://github.com/kcmr/Kustom-Color-Schemes",
+			"labels": ["color scheme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
 				}
 			]
 		},
@@ -141,7 +461,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/daris/sublime-kwrite-color-scheme/tree/master"
+					"branch": "master"
 				}
 			]
 		}

tests/unittest_compat.py

+import sys
+import re
+import unittest
+
+from functools import wraps
+
+
+def inject_into_unittest():
+    assert sys.version_info < (3,)
+
+    if sys.version_info < (2, 7):
+        class PatchedTestCase(unittest.TestCase):
+            def assertIn(self, member, container, msg=None):
+                """Just like self.assertTrue(a in b), but with a nicer default message."""
+                if member not in container:
+                    if not msg:
+                        msg = '%r not found in %r' % (member, container)
+                    self.fail(msg)
+
+            def assertNotIn(self, member, container, msg=None):
+                """Just like self.assertTrue(a not in b), but with a nicer default message."""
+                if member in container:
+                    if not msg:
+                        msg = '%s unexpectedly found in %s' % (member,
+                                                               container)
+                    self.fail(msg)
+
+            def assertGreater(self, a, b, msg=None):
+                """Just like self.assertTrue(a > b), but with a nicer default message."""
+                if not a > b:
+                    if not msg:
+                        msg = '%s not greater than %s' % (a, b)
+                    self.fail(msg)
+
+            def assertRegex(self, text, expected_regexp, msg=None):
+                """Fail the test unless the text matches the regular expression."""
+                if isinstance(expected_regexp, basestring):
+                    expected_regexp = re.compile(expected_regexp)
+                if not expected_regexp.search(text):
+                    msg = msg or "Regexp didn't match"
+                    msg = '%s: %r not found in %r' % (msg, expected_regexp.pattern, text)
+                    raise self.failureException(msg)
+
+            def assertNotRegex(self, text, unexpected_regexp, msg=None):
+                """Fail the test if the text matches the regular expression."""
+                if isinstance(unexpected_regexp, basestring):
+                    unexpected_regexp = re.compile(unexpected_regexp)
+                match = unexpected_regexp.search(text)
+                if match:
+                    msg = msg or "Regexp matched"
+                    msg = '%s: %r matches %r in %r' % (msg,
+                                                       text[match.start():match.end()],
+                                                       unexpected_regexp.pattern,
+                                                       text)
+                    raise self.failureException(msg)
+
+            def assertIsInstance(self, obj, cls, msg=None):
+                """Same as self.assertTrue(isinstance(obj, cls)), with a nicer
+                default message."""
+                if not isinstance(obj, cls):
+                    if not msg:
+                        msg = '%s is not an instance of %r' % (obj, cls)
+                    self.fail(msg)
+
+        unittest.TestCase = PatchedTestCase
+
+        # Patch setUpClass and tearDownClass into unittest.TestSuite
+        def run(self, result):
+            def run_if_attr(obj, attrname):
+                method = getattr(obj, attrname, None)
+                if method:
+                    method()
+
+            last_class = None
+            for test in self._tests:
+                if isinstance(test, unittest.TestCase):
+                    cur_class = test.__class__
+                    if last_class.__class__ != cur_class:
+                        if last_class is not None:
+                            run_if_attr(last_class, 'tearDownClass')
+                        run_if_attr(cur_class, 'setUpClass')
+                        last_class = cur_class
+
+                if result.shouldStop:
+                    break
+                test(result)
+
+            if last_class is not None:
+                run_if_attr(last_class, 'tearDownClass')
+
+            return result
+        unittest.TestSuite.run = run
+
+    elif sys.version_info < (3, 2):
+        unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
+        unittest.TestCase.assertNotRegex = unittest.TestCase.assertNotRegexpMatches

utils/migrator.py

@@ -240,7 +240,6 @@ with open(old_repositories_json_path, encoding='utf-8') as of:
                 'Diagram',
                 'Japanize',
                 'SimpleClone',
-                'MacTerminal',
                 'rsub',
                 'Pman',
                 'Gist'