Mandatory arguments

dib-lab · Oct 31, 2016 · dd795bc · dd795bc
1 parent 4ab32de
commit dd795bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/khmer/_khmer.cc b/khmer/_khmer.cc
@@ -262,7 +262,7 @@ khmer_Read_init(khmer_Read_Object *self, PyObject *args, PyObject *kwds)
         const_cast<char *>("quality"), const_cast<char *>("annotations"), NULL
     };
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|zzzz", kwlist,
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "ss|zz", kwlist,
                                      &name, &sequence, &quality, &annotations)) {
         return 0;
     }

diff --git a/tests/test_read_parsers.py b/tests/test_read_parsers.py
@@ -47,11 +47,16 @@
 
 def test_read_type_basic():
     # test that basic properties of khmer.Read behave like screed.Record
-    r = Read()
-    s = Record()
-    for attr in ('sequence', 'name', 'quality', 'annotations'):
-        assert not hasattr(r, attr), attr
-        assert not hasattr(s, attr), attr
+    name = "895:1:1:1246:14654 1:N:0:NNNNN"
+    sequence = "ACGT"
+    r = Read(name, sequence)
+    s = Record(dict(name=name, sequence=sequence))
+
+    for x in (r, s):
+        assert x.name == name
+        assert x.sequence == sequence
+        assert not hasattr(x, 'quality'), x
+        assert not hasattr(x, 'annotations'), x
 
 
 def test_read_type_attributes():