fixed #52 (again)

Author: MattDMo

PythonImproved.YAML-tmLanguage

@@ -307,7 +307,7 @@ patterns:
 - include: '#magic_variable_names'
 
 - name: meta.function-call.python
-  begin: (self|cls)\s*(?=(\())
+  begin: \b(self|cls)\b\s*(?=(\())
   beginCaptures:
     '1': {name: variable.language.python}
     '2': {name: punctuation.definition.arguments.begin.python}
@@ -774,7 +774,7 @@ repository:
     - include: $self
 
   language_variables:
-    match: (?<!\.)\b(self|cls)(?:\.|\()?
+    match: (?<!\.)\b(self|cls)\b(?:\.|\()?
     captures:
       "1": {name: variable.language.python}
 

PythonImproved.tmLanguage

@@ -847,7 +847,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(self|cls)\s*(?=(\())</string>
+			<string>\b(self|cls)\b\s*(?=(\())</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -2101,7 +2101,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?&lt;!\.)\b(self|cls)(?:\.|\()?</string>
+			<string>(?&lt;!\.)\b(self|cls)\b(?:\.|\()?</string>
 		</dict>
 		<key>line_continuation</key>
 		<dict>