Merge remote-tracking branch 'upstream/master'

repository/c.json

@@ -342,6 +342,16 @@
 				}
 			]
 		},
+		{
+			"name": "CFG Configuration Syntax Highlighting",
+			"details": "https://github.com/aronj/CFGGameConfigurationSyntax",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "cFos ml syntax",
 			"details": "https://github.com/ArmorDarks/cfos-ml-syntax",

repository/f.json

@@ -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",
 			"details": "https://github.com/shagabutdinov/sublime-file-dialog",

repository/q.json

@@ -11,6 +11,16 @@
 				}
 			]
 		},
+		{
+			"name": "QMakeProject",
+			"details": "https://github.com/nsubiron/sublime-qmakeproject-syntax",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "QML",
 			"details": "https://github.com/skozlovf/Sublime-QML",

repository/t.json

@@ -463,6 +463,17 @@
 				}
 			]
 		},
+		{
+			"name": "Theme - Carmesim",
+			"details": "https://github.com/sergiokopplin/carmesim",
+			"labels": ["theme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Theme - Centurion",
 			"details": "https://github.com/allanhortle/Centurion",
@@ -887,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",
 			"details": "https://github.com/Twiebie/ST-Spacefunk",

tests/test.py

@@ -27,6 +27,7 @@ if sys.version_info >= (3,):
     generator_method_type = 'method'
     str_cls = str
 else:
+    from . import unittest_compat
     from urlparse import urljoin
     from urllib2 import HTTPError, urlopen
     generator_method_type = 'instancemethod'

tests/unittest_compat.py

+import sys
 import re
 import unittest
 
 
-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)
-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."""
-    if member in container:
-        if not msg:
-            msg = '%s unexpectedly found in %s' % (member,
-                                                    container)
-        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."""
-    if not a > b:
-        if not msg:
-            msg = '%s not greater than %s' % (a, b)
-        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."""
-    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)
-unittest.TestCase.assertRegex = assertRegexpMatches
-
-def assertNotRegexpMatches(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)
-unittest.TestCase.assertNotRegex = assertNotRegexpMatches
-
-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.assertIsInstance = assertIsInstance
+if sys.version_info < (2, 7):
+    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)
+    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."""
+        if member in container:
+            if not msg:
+                msg = '%s unexpectedly found in %s' % (member,
+                                                        container)
+            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."""
+        if not a > b:
+            if not msg:
+                msg = '%s not greater than %s' % (a, b)
+            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."""
+        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)
+    unittest.TestCase.assertRegex = assertRegexpMatches
+
+    def assertNotRegexpMatches(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)
+    unittest.TestCase.assertNotRegex = assertNotRegexpMatches
+
+    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.assertIsInstance = assertIsInstance
+
+else:
+    unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
+    unittest.TestCase.assertNotRegex = unittest.TestCase.assertNotRegexpMatches