shippy · drmfinlay · Dec 5, 2019 · Dec 5, 2019 · Dec 5, 2019
diff --git a/gvim.py b/gvim.py
@@ -7,13 +7,6 @@
 from vim.rules import action, motion, object, navigation, buffer, quick_replace, quick_settings, diff, general
 from vim.plugins import surround, easy_motion, netrw, ctrlp, fugitive, unimpaired, snipmate
 from vim.vim_config import get_config
-try:
-    import pkg_resources
-    pkg_resources.require("dragonfly >= 0.6.5beta1.dev-r99")
-except ImportError:
-    pass
-
-print 'new gVim grammar accessed.'
 
 # Saving generally useful info
 config = get_config()
@@ -80,15 +73,15 @@ def _process_recognition(self, node, extras):
         # Note: there are issues with the super call. If you run into them,
         # do not fret and google for super TypeError order.
         super(self.__class__, self)._process_recognition(node, extras)
-        print "\n(INSERT)"
+        print("\n(INSERT)")
 
 class InsertModeDisabler(InsertModeFinishRule):
     def _process_recognition(self, node, extras):
         insertModeGrammar.disable()
         insertModeBootstrap.enable()
         normalModeGrammar.enable()
         super(self.__class__, self)._process_recognition(node, extras)
-        print "\n(NORMAL)"
+        print("\n(NORMAL)")
 
 ### 3. Command mode
 from vim.rules.command_mode import CommandModeStartRule, CommandModeFinishRule, CommandModeCommands
@@ -99,15 +92,15 @@ def _process_recognition(self, node, extras):
         normalModeGrammar.disable()
         commandModeGrammar.enable()
         super(self.__class__, self)._process_recognition(node, extras)
-        print "\n(EX MODE)"
+        print("\n(EX MODE)")
 
 class CommandModeDisabler(CommandModeFinishRule):
     def _process_recognition(self, node, extras):
         commandModeGrammar.disable()
         commandModeBootstrap.enable()
         normalModeGrammar.enable()
         super(self.__class__, self)._process_recognition(node, extras)
-        print "\n(NORMAL)"
+        print("\n(NORMAL)")
 
 ### 4. Prep & activate the requisite grammars
 gvim_exec_context = AppContext(executable="gvim")

diff --git a/__init__.py → vim/__init__.py b/__init__.py → vim/__init__.py
diff --git a/choices/__init__.py → vim/choices/__init__.py b/choices/__init__.py → vim/choices/__init__.py
diff --git a/choices/find.py → vim/choices/find.py b/choices/find.py → vim/choices/find.py
diff --git a/choices/letter.py → vim/choices/letter.py b/choices/letter.py → vim/choices/letter.py
diff --git a/choices/modifier.py → vim/choices/modifier.py b/choices/modifier.py → vim/choices/modifier.py
diff --git a/choices/motion.py → vim/choices/motion.py b/choices/motion.py → vim/choices/motion.py
diff --git a/choices/object.py → vim/choices/object.py b/choices/object.py → vim/choices/object.py
diff --git a/choices/search.py → vim/choices/search.py b/choices/search.py → vim/choices/search.py
diff --git a/choices/simple_verb.py → vim/choices/simple_verb.py b/choices/simple_verb.py → vim/choices/simple_verb.py
diff --git a/choices/surround.py → vim/choices/surround.py b/choices/surround.py → vim/choices/surround.py
diff --git a/choices/uncountableMotion.py → vim/choices/uncountableMotion.py b/choices/uncountableMotion.py → vim/choices/uncountableMotion.py
diff --git a/choices/verb.py → vim/choices/verb.py b/choices/verb.py → vim/choices/verb.py
diff --git a/lib/__init__.py → vim/lib/__init__.py b/lib/__init__.py → vim/lib/__init__.py
diff --git a/lib/execute_rule.py → vim/lib/execute_rule.py b/lib/execute_rule.py → vim/lib/execute_rule.py
@@ -19,7 +19,7 @@ def _executeRecursive(executable):
         for item in executable:
             _executeRecursive(item)
     else:
-        print "Neither executable nor a list: ", executable
+        print("Neither executable nor a list: ", executable)
 
 def execute_rule(*rule_names):
     def _exec_function(**kwargs):

diff --git a/navigation/__init__.py → vim/navigation/__init__.py b/navigation/__init__.py → vim/navigation/__init__.py
diff --git a/navigation/tabs.py → vim/navigation/tabs.py b/navigation/tabs.py → vim/navigation/tabs.py
diff --git a/plugins/__init__.py → vim/plugins/__init__.py b/plugins/__init__.py → vim/plugins/__init__.py
diff --git a/plugins/ctrlp.py → vim/plugins/ctrlp.py b/plugins/ctrlp.py → vim/plugins/ctrlp.py
diff --git a/plugins/easy_motion.py → vim/plugins/easy_motion.py b/plugins/easy_motion.py → vim/plugins/easy_motion.py
diff --git a/plugins/fugitive.py → vim/plugins/fugitive.py b/plugins/fugitive.py → vim/plugins/fugitive.py
diff --git a/plugins/netrw.py → vim/plugins/netrw.py b/plugins/netrw.py → vim/plugins/netrw.py
diff --git a/plugins/snipmate.py → vim/plugins/snipmate.py b/plugins/snipmate.py → vim/plugins/snipmate.py
diff --git a/plugins/surround.py → vim/plugins/surround.py b/plugins/surround.py → vim/plugins/surround.py
diff --git a/plugins/unimpaired.py → vim/plugins/unimpaired.py b/plugins/unimpaired.py → vim/plugins/unimpaired.py
diff --git a/rules/__init__.py → vim/rules/__init__.py b/rules/__init__.py → vim/rules/__init__.py
diff --git a/rules/action.py → vim/rules/action.py b/rules/action.py → vim/rules/action.py
diff --git a/rules/buffer.py → vim/rules/buffer.py b/rules/buffer.py → vim/rules/buffer.py
diff --git a/rules/command_mode.py → vim/rules/command_mode.py b/rules/command_mode.py → vim/rules/command_mode.py
diff --git a/rules/diff.py → vim/rules/diff.py b/rules/diff.py → vim/rules/diff.py
diff --git a/rules/general.py → vim/rules/general.py b/rules/general.py → vim/rules/general.py
diff --git a/rules/insert_mode.py → vim/rules/insert_mode.py b/rules/insert_mode.py → vim/rules/insert_mode.py
diff --git a/rules/letter.py → vim/rules/letter.py b/rules/letter.py → vim/rules/letter.py
diff --git a/rules/marks.py → vim/rules/marks.py b/rules/marks.py → vim/rules/marks.py
diff --git a/rules/motion.py → vim/rules/motion.py b/rules/motion.py → vim/rules/motion.py
diff --git a/rules/navigation.py → vim/rules/navigation.py b/rules/navigation.py → vim/rules/navigation.py
diff --git a/rules/object.py → vim/rules/object.py b/rules/object.py → vim/rules/object.py
diff --git a/rules/quick_replace.py → vim/rules/quick_replace.py b/rules/quick_replace.py → vim/rules/quick_replace.py
diff --git a/rules/quick_search.py → vim/rules/quick_search.py b/rules/quick_search.py → vim/rules/quick_search.py
diff --git a/rules/quick_settings.py → vim/rules/quick_settings.py b/rules/quick_settings.py → vim/rules/quick_settings.py
diff --git a/rules/registers.py → vim/rules/registers.py b/rules/registers.py → vim/rules/registers.py
diff --git a/vim_config.py → vim/vim_config.py b/vim_config.py → vim/vim_config.py