diff --git a/README.md b/README.md index ae58ab4..8a2bd24 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,11 @@ python -m unittest Tests.tests ``` ## Changelog +### v0.3.1 (08-07-2020) +- fix NoneType error while searching for institution code and name in `iter_results` +- API: remove `subject` attribute from `Marks` +- toJSON: now handle case where \_\_dict\_\_ is not present. +- API: add `toDict()` helper method to convert into python dict. ### v0.3 (08-07-2020) [Breaking Changes] - API: remove unused `Student` class - API: merge `Student` properties into `Result`. diff --git a/Resources/results.json b/Resources/results.json index 6128256..cfabb98 100644 --- a/Resources/results.json +++ b/Resources/results.json @@ -12,7 +12,6 @@ "minor": 16, "paper_credit": 3, "paper_id": 15105, - "subject": null, "total": 64 }, "15107": { @@ -21,7 +20,6 @@ "minor": 13, "paper_credit": 4, "paper_id": 15107, - "subject": null, "total": 52 }, "15155": { @@ -30,7 +28,6 @@ "minor": 32, "paper_credit": 1, "paper_id": 15155, - "subject": null, "total": 81 }, "15157": { @@ -39,7 +36,6 @@ "minor": 17, "paper_credit": 1, "paper_id": 15157, - "subject": null, "total": 42 }, "15159": { @@ -48,7 +44,6 @@ "minor": 26, "paper_credit": 1, "paper_id": 15159, - "subject": null, "total": 79 }, "98101": { @@ -57,7 +52,6 @@ "minor": 17, "paper_credit": 3, "paper_id": 98101, - "subject": null, "total": 70 }, "98119": { @@ -66,7 +60,6 @@ "minor": null, "paper_credit": 1, "paper_id": 98119, - "subject": null, "total": 65 }, "99103": { @@ -75,7 +68,6 @@ "minor": 15, "paper_credit": 3, "paper_id": 99103, - "subject": null, "total": 61 }, "99109": { @@ -84,7 +76,6 @@ "minor": 6, "paper_credit": 4, "paper_id": 99109, - "subject": null, "total": 11 }, "99111": { @@ -93,7 +84,6 @@ "minor": 15, "paper_credit": 3, "paper_id": 99111, - "subject": null, "total": 60 }, "99151": { @@ -102,7 +92,6 @@ "minor": 28, "paper_credit": 1, "paper_id": 99151, - "subject": null, "total": 73 }, "99153": { @@ -111,7 +100,6 @@ "minor": 36, "paper_credit": 1, "paper_id": 99153, - "subject": null, "total": 78 } }, @@ -134,7 +122,6 @@ "minor": 23, "paper_credit": 3, "paper_id": 15105, - "subject": null, "total": 69 }, "15107": { @@ -143,7 +130,6 @@ "minor": 9, "paper_credit": 4, "paper_id": 15107, - "subject": null, "total": 31 }, "15155": { @@ -152,7 +138,6 @@ "minor": 31, "paper_credit": 1, "paper_id": 15155, - "subject": null, "total": 78 }, "15157": { @@ -161,7 +146,6 @@ "minor": 12, "paper_credit": 1, "paper_id": 15157, - "subject": null, "total": 32 }, "15159": { @@ -170,7 +154,6 @@ "minor": 29, "paper_credit": 1, "paper_id": 15159, - "subject": null, "total": 80 }, "98101": { @@ -179,7 +162,6 @@ "minor": 21, "paper_credit": 3, "paper_id": 98101, - "subject": null, "total": 66 }, "98119": { @@ -188,7 +170,6 @@ "minor": null, "paper_credit": 1, "paper_id": 98119, - "subject": null, "total": 62 }, "99103": { @@ -197,7 +178,6 @@ "minor": 15, "paper_credit": 3, "paper_id": 99103, - "subject": null, "total": 52 }, "99109": { @@ -206,7 +186,6 @@ "minor": 7, "paper_credit": 4, "paper_id": 99109, - "subject": null, "total": 13 }, "99111": { @@ -215,7 +194,6 @@ "minor": 12, "paper_credit": 3, "paper_id": 99111, - "subject": null, "total": 41 }, "99151": { @@ -224,7 +202,6 @@ "minor": 27, "paper_credit": 1, "paper_id": 99151, - "subject": null, "total": 71 }, "99153": { @@ -233,7 +210,6 @@ "minor": 31, "paper_credit": 1, "paper_id": 99153, - "subject": null, "total": 70 } }, @@ -256,7 +232,6 @@ "minor": 16, "paper_credit": 3, "paper_id": 15105, - "subject": null, "total": 54 }, "15107": { @@ -265,7 +240,6 @@ "minor": 11, "paper_credit": 4, "paper_id": 15107, - "subject": null, "total": 42 }, "15155": { @@ -274,7 +248,6 @@ "minor": 34, "paper_credit": 1, "paper_id": 15155, - "subject": null, "total": 82 }, "15157": { @@ -283,7 +256,6 @@ "minor": 13, "paper_credit": 1, "paper_id": 15157, - "subject": null, "total": 40 }, "15159": { @@ -292,7 +264,6 @@ "minor": 30, "paper_credit": 1, "paper_id": 15159, - "subject": null, "total": 83 }, "98101": { @@ -301,7 +272,6 @@ "minor": 22, "paper_credit": 3, "paper_id": 98101, - "subject": null, "total": 74 }, "98119": { @@ -310,7 +280,6 @@ "minor": null, "paper_credit": 1, "paper_id": 98119, - "subject": null, "total": 62 }, "99103": { @@ -319,7 +288,6 @@ "minor": 16, "paper_credit": 3, "paper_id": 99103, - "subject": null, "total": 45 }, "99109": { @@ -328,7 +296,6 @@ "minor": 11, "paper_credit": 4, "paper_id": 99109, - "subject": null, "total": 33 }, "99111": { @@ -337,7 +304,6 @@ "minor": 16, "paper_credit": 3, "paper_id": 99111, - "subject": null, "total": 54 }, "99151": { @@ -346,7 +312,6 @@ "minor": 28, "paper_credit": 1, "paper_id": 99151, - "subject": null, "total": 72 }, "99153": { @@ -355,7 +320,6 @@ "minor": 38, "paper_credit": 1, "paper_id": 99153, - "subject": null, "total": 84 } }, @@ -378,7 +342,6 @@ "minor": 16, "paper_credit": 3, "paper_id": 15105, - "subject": null, "total": 57 }, "15107": { @@ -387,7 +350,6 @@ "minor": 14, "paper_credit": 4, "paper_id": 15107, - "subject": null, "total": 65 }, "15155": { @@ -396,7 +358,6 @@ "minor": 34, "paper_credit": 1, "paper_id": 15155, - "subject": null, "total": 83 }, "15157": { @@ -405,7 +366,6 @@ "minor": 22, "paper_credit": 1, "paper_id": 15157, - "subject": null, "total": 55 }, "15159": { @@ -414,7 +374,6 @@ "minor": 27, "paper_credit": 1, "paper_id": 15159, - "subject": null, "total": 80 }, "98101": { @@ -423,7 +382,6 @@ "minor": 22, "paper_credit": 3, "paper_id": 98101, - "subject": null, "total": 78 }, "98119": { @@ -432,7 +390,6 @@ "minor": null, "paper_credit": 1, "paper_id": 98119, - "subject": null, "total": 63 }, "99103": { @@ -441,7 +398,6 @@ "minor": 16, "paper_credit": 3, "paper_id": 99103, - "subject": null, "total": 59 }, "99109": { @@ -450,7 +406,6 @@ "minor": 7, "paper_credit": 4, "paper_id": 99109, - "subject": null, "total": 50 }, "99111": { @@ -459,7 +414,6 @@ "minor": 15, "paper_credit": 3, "paper_id": 99111, - "subject": null, "total": 45 }, "99151": { @@ -468,7 +422,6 @@ "minor": 27, "paper_credit": 1, "paper_id": 99151, - "subject": null, "total": 71 }, "99153": { @@ -477,7 +430,6 @@ "minor": 25, "paper_credit": 1, "paper_id": 99153, - "subject": null, "total": 66 } }, @@ -500,7 +452,6 @@ "minor": 14, "paper_credit": 3, "paper_id": 15105, - "subject": null, "total": 64 }, "15107": { @@ -509,7 +460,6 @@ "minor": 10, "paper_credit": 4, "paper_id": 15107, - "subject": null, "total": 29 }, "15155": { @@ -518,7 +468,6 @@ "minor": 33, "paper_credit": 1, "paper_id": 15155, - "subject": null, "total": 81 }, "15157": { @@ -527,7 +476,6 @@ "minor": 20, "paper_credit": 1, "paper_id": 15157, - "subject": null, "total": 50 }, "15159": { @@ -536,7 +484,6 @@ "minor": 25, "paper_credit": 1, "paper_id": 15159, - "subject": null, "total": 76 }, "98101": { @@ -545,7 +492,6 @@ "minor": 19, "paper_credit": 3, "paper_id": 98101, - "subject": null, "total": 67 }, "98119": { @@ -554,7 +500,6 @@ "minor": null, "paper_credit": 1, "paper_id": 98119, - "subject": null, "total": 0 }, "99103": { @@ -563,7 +508,6 @@ "minor": 14, "paper_credit": 3, "paper_id": 99103, - "subject": null, "total": 46 }, "99109": { @@ -572,7 +516,6 @@ "minor": 5, "paper_credit": 4, "paper_id": 99109, - "subject": null, "total": 7 }, "99111": { @@ -581,7 +524,6 @@ "minor": 13, "paper_credit": 3, "paper_id": 99111, - "subject": null, "total": 40 }, "99151": { @@ -590,7 +532,6 @@ "minor": 27, "paper_credit": 1, "paper_id": 99151, - "subject": null, "total": 72 }, "99153": { @@ -599,7 +540,6 @@ "minor": 39, "paper_credit": 1, "paper_id": 99153, - "subject": null, "total": 81 } }, @@ -622,7 +562,6 @@ "minor": 21, "paper_credit": 3, "paper_id": 15105, - "subject": null, "total": 55 }, "15107": { @@ -631,7 +570,6 @@ "minor": 14, "paper_credit": 4, "paper_id": 15107, - "subject": null, "total": 50 }, "15155": { @@ -640,7 +578,6 @@ "minor": 30, "paper_credit": 1, "paper_id": 15155, - "subject": null, "total": 75 }, "15157": { @@ -649,7 +586,6 @@ "minor": 16, "paper_credit": 1, "paper_id": 15157, - "subject": null, "total": 44 }, "15159": { @@ -658,7 +594,6 @@ "minor": 29, "paper_credit": 1, "paper_id": 15159, - "subject": null, "total": 80 }, "98101": { @@ -667,7 +602,6 @@ "minor": 20, "paper_credit": 3, "paper_id": 98101, - "subject": null, "total": 60 }, "98119": { @@ -676,7 +610,6 @@ "minor": null, "paper_credit": 1, "paper_id": 98119, - "subject": null, "total": 61 }, "99103": { @@ -685,7 +618,6 @@ "minor": 16, "paper_credit": 3, "paper_id": 99103, - "subject": null, "total": 54 }, "99109": { @@ -694,7 +626,6 @@ "minor": 11, "paper_credit": 4, "paper_id": 99109, - "subject": null, "total": 29 }, "99111": { @@ -703,7 +634,6 @@ "minor": 13, "paper_credit": 3, "paper_id": 99111, - "subject": null, "total": 57 }, "99151": { @@ -712,7 +642,6 @@ "minor": 29, "paper_credit": 1, "paper_id": 99151, - "subject": null, "total": 75 }, "99153": { @@ -721,7 +650,6 @@ "minor": 35, "paper_credit": 1, "paper_id": 99153, - "subject": null, "total": 74 } }, @@ -744,7 +672,6 @@ "minor": 8, "paper_credit": 3, "paper_id": 15105, - "subject": null, "total": 31 }, "15107": { @@ -753,7 +680,6 @@ "minor": 9, "paper_credit": 4, "paper_id": 15107, - "subject": null, "total": 40 }, "15155": { @@ -762,7 +688,6 @@ "minor": 34, "paper_credit": 1, "paper_id": 15155, - "subject": null, "total": 83 }, "15157": { @@ -771,7 +696,6 @@ "minor": 21, "paper_credit": 1, "paper_id": 15157, - "subject": null, "total": 55 }, "15159": { @@ -780,7 +704,6 @@ "minor": 28, "paper_credit": 1, "paper_id": 15159, - "subject": null, "total": 81 }, "98101": { @@ -789,7 +712,6 @@ "minor": 22, "paper_credit": 3, "paper_id": 98101, - "subject": null, "total": 82 }, "98119": { @@ -798,7 +720,6 @@ "minor": null, "paper_credit": 1, "paper_id": 98119, - "subject": null, "total": 63 }, "99103": { @@ -807,7 +728,6 @@ "minor": 15, "paper_credit": 3, "paper_id": 99103, - "subject": null, "total": 55 }, "99109": { @@ -816,7 +736,6 @@ "minor": 5, "paper_credit": 4, "paper_id": 99109, - "subject": null, "total": 11 }, "99111": { @@ -825,7 +744,6 @@ "minor": 14, "paper_credit": 3, "paper_id": 99111, - "subject": null, "total": 51 }, "99151": { @@ -834,7 +752,6 @@ "minor": 27, "paper_credit": 1, "paper_id": 99151, - "subject": null, "total": 71 }, "99153": { @@ -843,7 +760,6 @@ "minor": 30, "paper_credit": 1, "paper_id": 99153, - "subject": null, "total": 64 } }, diff --git a/ggsipu_result/__init__.py b/ggsipu_result/__init__.py index 8dd2e6a..90b9d23 100644 --- a/ggsipu_result/__init__.py +++ b/ggsipu_result/__init__.py @@ -7,9 +7,9 @@ ) from .objects import Subject, Result, Marks -from .util import toJSON +from .util import toJSON, toDict -__version__ = "0.3" +__version__ = "0.3.1" def iter_pages(pdf, start=0, end=0):