reorganize code

SublimeText · Sep 22, 2012 · 7552322 · 7552322
1 parent 13ececf
commit 7552322
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/ex_command_parser.py b/ex_command_parser.py
@@ -92,7 +92,8 @@
     ('ls', 'ls'): ex_cmd_data(
                                 command='ex_prompt_select_open_file',
                                 invocations=(),
-                                error_on=(ex_error.ERR_TRAILING_CHARS,)
+                                error_on=(ex_error.ERR_TRAILING_CHARS,
+                                          ex_error.ERR_NO_RANGE_ALLOWED,)
                                 ),
     ('registers', 'reg'): ex_cmd_data(
                                 command='ex_list_registers',

diff --git a/ex_commands.py b/ex_commands.py
@@ -17,8 +17,8 @@
 import ex_error
 import ex_range
 import shell
-from vex import substitute
-from vex import global_command
+from vex.parsers import global_command
+from vex.parsers import substitute
 from vex.parsers import rangeparser
 
 GLOBAL_RANGES = []

diff --git a/tests/test_global.py b/tests/test_global.py
@@ -1,6 +1,6 @@
 import unittest
 
-from vex.global_command import GlobalLexer
+from vex.parsers.global_command import GlobalLexer
 
 
 class TestGlobalLexer(unittest.TestCase):
@@ -22,3 +22,7 @@ def testCanEscapeCharactersInSearchPattern(self):
     def testCanEscapeBackSlashes(self):
         actual = self.lexer.parse(r'/\\/p#')
         self.assertEqual(actual, ['\\', 'p#'])
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/test_substitute.py b/tests/test_substitute.py
@@ -1,9 +1,9 @@
 import unittest
 
-from vex.substitute import SubstituteLexer
-from vex.parsing import RegexToken
-from vex.parsing import Lexer
-from vex.parsing import EOF
+from vex.parsers.substitute import SubstituteLexer
+from vex.parsers.parsing import RegexToken
+from vex.parsers.parsing import Lexer
+from vex.parsers.parsing import EOF
 
 
 class TestRegexToken(unittest.TestCase):

diff --git a/vex/global_command.py → vex/parsers/global_command.py b/vex/global_command.py → vex/parsers/global_command.py
@@ -1,6 +1,6 @@
-from vex.parsing import RegexToken
-from vex.parsing import Lexer
-from vex.parsing import EOF
+from vex.parsers.parsing import RegexToken
+from vex.parsers.parsing import Lexer
+from vex.parsers.parsing import EOF
 
 
 class GlobalLexer(Lexer):

diff --git a/vex/parsing.py → vex/parsers/parsing.py b/vex/parsing.py → vex/parsers/parsing.py
diff --git a/vex/substitute.py → vex/parsers/substitute.py b/vex/substitute.py → vex/parsers/substitute.py
@@ -1,6 +1,6 @@
-from vex.parsing import RegexToken
-from vex.parsing import Lexer
-from vex.parsing import EOF
+from vex.parsers.parsing import RegexToken
+from vex.parsers.parsing import Lexer
+from vex.parsers.parsing import EOF
 
 
 class SubstituteLexer(Lexer):