add ST3 compartibility

raymondkww · Apr 14, 2013 · 75d2444 · 75d2444
1 parent a7ca90d
commit 75d2444
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Enhanced R: R Plugin for Sublime Text 2
+Enhanced R: R Plugin for Sublime Text 2/3
 =======================================
 
 Introduction

diff --git a/Rsublime.py b/Rsublime.py
@@ -2,9 +2,14 @@
 import sublime_plugin
 import os
 import subprocess
-import string
 import re
 
+import sys
+if sys.version >= '3':
+    string = str
+else:
+    import string
+
 ########################
 #### R Common CLass ####
 ########################
@@ -13,8 +18,8 @@ class RCommon:
     settings = sublime.load_settings('Rsublime.sublime-settings')
     if settings.has('Rapp'):
         Rapplist = settings.get('Rapp')
-        if isinstance(Rapplist, unicode):
-            Rapplist = [Rapplist, "Terminal"]
+    else:
+        Rapplist = None
     if not Rapplist:
         Rapplist = ["R64", "Terminal"]
     if Rapplist != settings.get('Rapp'):
@@ -69,6 +74,9 @@ def run(self, edit, which):
                 cmd += self.view.substr(self.view.line(sel)) +'\n'
             else:
                 cmd += self.view.substr(sel) +'\n'
+
+        # save for later use
+        # '^.*(\{(?:(["\'])(?:[^\\\\]|\\\\.|\n)*?\\2|#.*$|[^\{\}]|\n|(?1))*\})'
         self.rcmd(cmd, which)
 
 ######################

diff --git a/packages.json b/packages.json
@@ -3,14 +3,14 @@
     "packages": [
         {
             "name": "Enhanced R",
-            "description": "R plugin for Sublime Text 2: Enchancement of indentation rules and language definitions; Tools that make programing R in Sublime Text 2 FUN!",
+            "description": "R plugin for Sublime Text 2/3: Enchancement of indentation rules and language definitions; Tools that make programing R in Sublime Text 2/3 FUN!",
             "author": "raymondkww, randy3k",
             "homepage": "https://github.com/raymondkww/R-sublime",
             "last_modified": "2012-11-15 18:00:00",
             "platforms": {
                 "osx": [
                     {
-                        "version": "1.0.0",
+                        "version": "1.1.0",
                         "url": "https://nodeload.github.com/raymondkww/R-sublime/zip/master"
                     }
                 ]