Merge branch 'dev' into diff

test/test_common.py

@@ -0,0 +1,13 @@
+from jedi.common import splitlines
+
+
+def test_splitlines_no_keepends():
+    assert splitlines('asd\r\n') == ['asd', '']
+    assert splitlines('asd\r\n\f') == ['asd', '\f']
+    assert splitlines('\fasd\r\n') == ['\fasd', '']
+
+
+def test_splitlines_keepends():
+    assert splitlines('asd\r\n', keepends=True) == ['asd\r\n', '']
+    assert splitlines('asd\r\n\f', keepends=True) == ['asd\r\n', '\f']
+    assert splitlines('\fasd\r\n', keepends=True) == ['\fasd\r\n', '']