Address some sublime2 compatibility issues found by @ariswang92

jason-kane · May 10, 2021 · 201575f · 201575f
1 parent 343df2e
commit 201575f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/PyYapf.py b/PyYapf.py
@@ -202,10 +202,13 @@ def find_yapf(self):
         # default to what is in the settings file
         cmd = self.get_setting("yapf_command")
         cmd = os.path.expanduser(cmd)
-        cmd = sublime.expand_variables(
-            cmd,
-            sublime.active_window().extract_variables()
-        )
+
+        # sublime 2.x support per https://github.com/jason-kane/PyYapf/issues/53
+        if hasattr(sublime, "expand_variables"):
+            cmd = sublime.expand_variables(
+                cmd,
+                sublime.active_window().extract_variables()
+            )
 
         save_settings = not cmd
 

diff --git a/PyYapf.sublime-settings b/PyYapf.sublime-settings
@@ -9,7 +9,7 @@
       "on_save": false,
 
       // ignore files matching glob(s)
-      "onsave_ignore_fn_glob": ["*.pyx", ],
+      "onsave_ignore_fn_glob": ["*.pyx"],
 
       // report errors in popup dialog (in addition to status bar)
       "popup_errors": false,