Officially remove Python 2.6 and 3.3 support.

pekkaklarck · pekkaklarck · commit 8c379e75f8d2 · 2018-06-06T23:38:49.000+03:00
Also removed Python 2.6 compatibility code so it really won't work anymore. Python 3.3 still works, but we are not going to support it or test using it in the future. Fixes robotframework#2276.
diff --git a/setup.py b/setup.py
@@ -23,10 +23,8 @@
 License :: OSI Approved :: Apache Software License
 Operating System :: OS Independent
 Programming Language :: Python :: 2
-Programming Language :: Python :: 2.6
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.3
 Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6
diff --git a/src/robot/reporting/logreportwriters.py b/src/robot/reporting/logreportwriters.py
@@ -43,8 +43,8 @@ def write(self, path, config):
             self._write_split_logs(splitext(path)[0])
 
     def _write_split_logs(self, base):
-        for index, (keywords, strings) in enumerate(self._js_model.split_results):
-            index += 1  # enumerate accepts start index only in Py 2.6+
+        for index, (keywords, strings) in enumerate(self._js_model.split_results,
+                                                    start=1):
             self._write_split_log(index, keywords, strings, '%s-%d.js' % (base, index))
 
     def _write_split_log(self, index, keywords, strings, path):
diff --git a/src/robot/running/namespace.py b/src/robot/running/namespace.py
@@ -343,7 +343,7 @@ def _get_runner_based_on_search_order(self, runners):
         return runners
 
     def _filter_stdlib_runner(self, runner1, runner2):
-        stdlibs_without_remote = STDLIBS - set(['Remote'])
+        stdlibs_without_remote = STDLIBS - {'Remote'}
         if runner1.library.orig_name in stdlibs_without_remote:
             standard, custom = runner1, runner2
         elif runner2.library.orig_name in stdlibs_without_remote:
diff --git a/src/robot/utils/dotdict.py b/src/robot/utils/dotdict.py
@@ -13,10 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-try:
-    from collections import OrderedDict
-except ImportError:  # New in Python 2.7
-    from .ordereddict import OrderedDict
+from collections import OrderedDict
 
 from .robottypes import is_dict_like
 
diff --git a/src/robot/utils/ordereddict.py b/src/robot/utils/ordereddict.py
diff --git a/src/robot/utils/robotpath.py b/src/robot/utils/robotpath.py
@@ -25,12 +25,7 @@
 from .unic import unic
 
 
-if sys.version_info < (2,7):
-    def _abspath(path):
-        if WINDOWS and os.path.splitunc(path)[0]:
-            return os.path.abspath(path)
-        return os.path.abspath(os.path.join(os.getcwdu(), path))
-elif IRONPYTHON and sys.version_info[:3] == (2, 7, 8):
+if IRONPYTHON and sys.version_info[:3] == (2, 7, 8):
     # https://github.com/IronLanguages/ironpython2/issues/371
     def _abspath(path):
         if os.path.isabs(path):
@@ -86,8 +81,6 @@ def abspath(path, case_normalize=False):
     2. Optionally lower-case paths on case-insensitive file systems.
        That includes Windows and also OSX in default configuration.
     3. Turn ``c:`` into ``c:\\`` on Windows instead of ``c:\\current\\path``.
-    4. Handle non-ASCII characters on working directory with Python < 2.6.5:
-       http://bugs.python.org/issue3426
     """
     path = normpath(path, case_normalize)
     return normpath(_abspath(path), case_normalize)
diff --git a/src/robot/utils/robottypes.py b/src/robot/utils/robottypes.py
@@ -25,7 +25,7 @@
                               is_number, is_string, is_unicode, type_name)
 
 
-FALSE_STRINGS = set(['FALSE', 'NONE', 'NO', ''])
+FALSE_STRINGS = {'FALSE', 'NONE', 'NO', ''}
 
 
 def is_truthy(item):
diff --git a/src/robot/variables/splitter.py b/src/robot/variables/splitter.py
@@ -79,8 +79,7 @@ def _split(self, string):
         self._index_chars = []
         self._string = string
         start_index += 2
-        for index, char in enumerate(string[start_index:]):
-            index += start_index  # Giving start to enumerate only in Py 2.6+
+        for index, char in enumerate(string[start_index:], start=start_index):
             try:
                 self._state(char, index)
             except StopIteration:
