Merge pull request #27 from ftobia/feature/minor-cleanup

Minor cleanup

Author: ftobia

.gitignore

@@ -40,3 +40,6 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+# Misc
+.cache

.travis.yml

@@ -1,6 +1,8 @@
 language: python
-python: 2.7
+python: "3.5"
 env:
+  - TOX_ENV=py35
+  - TOX_ENV=py34
   - TOX_ENV=py33
   - TOX_ENV=py27
   - TOX_ENV=py26

AUTHORS

@@ -1,2 +1,3 @@
 Frank Tobia <[email protected]>
 Sergei Chipiga <[email protected]>
+Ben Greene <[email protected]>

pytest_ordering/__init__.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from ._version import __version__
 
+import operator
+
 import pytest
 
 orders_map = {
@@ -55,16 +57,16 @@ def pytest_collection_modifyitems(session, config, items):
 
         grouped_items.setdefault(order, []).append(item)
 
-    if grouped_items:
-        sorted_items = []
-
-        unordered_items = [grouped_items.pop(None, [])]
+    sorted_items = []
+    unordered_items = [grouped_items.pop(None, [])]
 
-        start_list = sorted((i for i in grouped_items.items() if i[0] >= 0), key=lambda x: x[0])
-        end_list = sorted((i for i in grouped_items.items() if i[0] < 0), key=lambda x: x[0])
+    start_list = sorted((i for i in grouped_items.items() if i[0] >= 0),
+                        key=operator.itemgetter(0))
+    end_list = sorted((i for i in grouped_items.items() if i[0] < 0),
+                      key=operator.itemgetter(0))
 
-        sorted_items.extend([i[1] for i in start_list])
-        sorted_items.extend(unordered_items)
-        sorted_items.extend([i[1] for i in end_list])
+    sorted_items.extend([i[1] for i in start_list])
+    sorted_items.extend(unordered_items)
+    sorted_items.extend([i[1] for i in end_list])
 
-        items[:] = [item for sublist in sorted_items for item in sublist]
+    items[:] = [item for sublist in sorted_items for item in sublist]

tox.ini

@@ -1,6 +1,6 @@
 # content of: tox.ini, put in same dir as setup.py
 [tox]
-envlist = py26,py27,py32,py33,pypy
+envlist = py26,py27,py33,py34,py35,pypy
 [testenv]
 deps=pytest
     pytest-cov