Skip ansi related test with PythonScript3 version

Author: Ekopalypse

PythonScript/python_tests/tests/test_ReplaceAnsiPythonFunction.py

@@ -33,13 +33,15 @@ def tearDown(self):
         editor.setSavePoint()
         notepad.close()
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_replace_function(self):
         editor.rereplace(r'([a-z]+)([0-9]+)'.encode('windows-1252'), group2_with_counter)
         text = editor.getText()
         self.assertEqual(text, u'1231 54322 983\r\nä1234 ü54325 ö986\r\n'.encode('windows-1252'))
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_unicode_replace_function(self):
-        editor.rereplace(ur'([a-zäöü]+)([0-9]+)', group1_with_counter)
+        editor.rereplace(r'([a-zäöü]+)([0-9]+)', group1_with_counter)
         text = editor.getText()
         self.assertEqual(text, u'abc1 def2 gh3\r\näbc4 üef5 öh6\r\n'.encode('windows-1252'))
 
@@ -55,24 +57,27 @@ def groups_check(self, m):
         self.assertEqual(m.groups(), groups_data_correct[counter])
         return counter
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_groups(self):
-        editor.rereplace(ur'([a-zäöü]+)([0-9]+)', lambda m: self.groups_check(m))
+        editor.rereplace(r'([a-zäöü]+)([0-9]+)', lambda m: self.groups_check(m))
         text = editor.getText()
         self.assertEqual(text, '1 2 3\r\n4 5 6\r\n')
 
-
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_groups_with_named_groups(self):
-        editor.rereplace(ur'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: self.groups_check(m))
+        editor.rereplace(r'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: self.groups_check(m))
         text = editor.getText()
         self.assertEqual(text, '1 2 3\r\n4 5 6\r\n')
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_named_groups(self):
-        editor.rereplace(ur'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: m.group('letters'))
+        editor.rereplace(r'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: m.group('letters'))
         text = editor.getText()
         self.assertEqual(text, u'abc def gh\r\näbc üef öh\r\n'.encode('windows-1252'))
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_named_groups_2(self):
-        editor.rereplace(ur'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: m.group('numbers'))
+        editor.rereplace(r'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: m.group('numbers'))
         text = editor.getText()
         self.assertEqual(text, '123 5432 98\r\n123 5432 98\r\n')
 
@@ -89,8 +94,9 @@ def group_tuples_check(self, m):
         self.assertEqual(m.group(2, 'letters', 'numbers'), groups_data_correct[counter])
         return counter
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_group_tuples(self):
-        editor.rereplace(ur'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: self.group_tuples_check(m))
+        editor.rereplace(r'(?<letters>[a-zäöü]+)(?<numbers>[0-9]+)', lambda m: self.group_tuples_check(m))
         text = editor.getText()
         self.assertEqual(text, '1 2 3\r\n4 5 6\r\n')
 

PythonScript/python_tests/tests/test_ReplaceAnsiTestCase.py

@@ -6,27 +6,32 @@ class ReplaceAnsiTestCase(unittest.TestCase):
     def setUp(self):
         notepad.new()
         notepad.runMenuCommand("Encoding", "Convert to ANSI")
-        editor.write(u'Here is some text\r\nWith some umlauts XäXüXö\r\n'.encode('windows-1252'));
+        editor.write(u'Here is some text\r\nWith some umlauts XäXüXö\r\n'.encode('windows-1252'))
+
 
     def tearDown(self):
         editor.setSavePoint()
         notepad.close()
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_simple_replace(self):
-        editor.rereplace(r'some\s([a-z]+)', 'TEST');
+        editor.rereplace(r'some\s([a-z]+)', 'TEST')
         text = editor.getText()
-        self.assertEqual(text, u'Here is TEST\r\nWith TEST XäXüXö\r\n'.encode('windows-1252'));
+        self.assertEqual(text, u'Here is TEST\r\nWith TEST XäXüXö\r\n'.encode('windows-1252'))
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_ansi_replace(self):
-        editor.rereplace(u'X[äö]'.encode('windows-1252'), 'YY');
+        editor.rereplace(u'X[äö]'.encode('windows-1252'), 'YY')
         text = editor.getText()
-        self.assertEqual(text, u'Here is some text\r\nWith some umlauts YYXüYY\r\n'.encode('windows-1252'));
+        self.assertEqual(text, u'Here is some text\r\nWith some umlauts YYXüYY\r\n'.encode('windows-1252'))
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_unicode_replace(self):
-        editor.rereplace(u'X[äö]', 'PP');
+        editor.rereplace(u'X[äö]', 'PP')
         text = editor.getText()
-        self.assertEqual(text, u'Here is some text\r\nWith some umlauts PPXüPP\r\n'.encode('windows-1252'));
+        self.assertEqual(text, u'Here is some text\r\nWith some umlauts PPXüPP\r\n'.encode('windows-1252'))
 
+    @unittest.skipIf(notepad.getPluginVersion()[0] == '3', "not yet py3-compatible")
     def test_replace_with_unicode(self):
         editor.rereplace('Here|With', u'XäöüY')
         text = editor.getText()