ConsoleFramework 1.3.0__tar.gz → 1.3.1__tar.gz

{consoleframework-1.3.0 → consoleframework-1.3.1}/ConsoleFramework/core.cpp

@@ -1,7 +1,7 @@
 /*
 ConsoleFramework - The best Console Library of the Python.
 By: Suleiman
-Copyright © Suleiman 2026
+Copyright В© Suleiman 2026
 All rights are reserved.
 */
 #include <Python.h>
@@ -81,34 +81,42 @@ static void project_3d(Vec3 v, double rx, double ry, double rz, double scale, in
     *oy = (int)(-v.y * scale + cy);
 }
 
-static PyObject* rgb(PyObject* self, PyObject* args) {
+static PyObject* rgb(PyObject* self, PyObject* args, PyObject* kwargs) {
     int r, g, b;
-    if (!PyArg_ParseTuple(args, "iii", &r, &g, &b)) return NULL;
+    static char* kwlist[] = {"r", "g", "b", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii", kwlist, &r, &g, &b))
+        return NULL;
     char buf[32];
     sprintf(buf, "\033[38;2;%d;%d;%dm", r, g, b);
     return PyUnicode_FromString(buf);
 }
 
-static PyObject* bg_rgb(PyObject* self, PyObject* args) {
+static PyObject* bg_rgb(PyObject* self, PyObject* args, PyObject* kwargs) {
     int r, g, b;
-    if (!PyArg_ParseTuple(args, "iii", &r, &g, &b)) return NULL;
+    static char* kwlist[] = {"r", "g", "b", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii", kwlist, &r, &g, &b))
+        return NULL;
     char buf[32];
     sprintf(buf, "\033[48;2;%d;%d;%dm", r, g, b);
     return PyUnicode_FromString(buf);
 }
 
-static PyObject* colorize(PyObject* self, PyObject* args) {
+static PyObject* colorize(PyObject* self, PyObject* args, PyObject* kwargs) {
     const char* text, *color;
     int reset = 1;
-    if (!PyArg_ParseTuple(args, "ss|i", &text, &color, &reset)) return NULL;
+    static char* kwlist[] = {"text", "color", "reset", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss|i", kwlist, &text, &color, &reset))
+        return NULL;
     string result = string(color) + text + (reset ? "\033[0m" : "");
     return PyUnicode_FromString(result.c_str());
 }
 
-static PyObject* get_line_points(PyObject* self, PyObject* args) {
+static PyObject* get_line_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int x1, y1, x2, y2;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iiii|s", &x1, &y1, &x2, &y2, &ch)) return NULL;
+    static char* kwlist[] = {"x1", "y1", "x2", "y2", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiii|s", kwlist, &x1, &y1, &x2, &y2, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     int dx = abs(x2 - x1);
     int dy = abs(y2 - y1);
@@ -130,10 +138,12 @@ static PyObject* get_line_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_circle_points(PyObject* self, PyObject* args) {
+static PyObject* get_circle_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int cx, cy, r;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iii|s", &cx, &cy, &r, &ch)) return NULL;
+    static char* kwlist[] = {"cx", "cy", "r", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii|s", kwlist, &cx, &cy, &r, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int angle = 0; angle < 360; angle += 5) {
         double rad = angle * M_PI / 180.0;
@@ -149,10 +159,12 @@ static PyObject* get_circle_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_filled_circle_points(PyObject* self, PyObject* args) {
+static PyObject* get_filled_circle_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int cx, cy, r;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iii|s", &cx, &cy, &r, &ch)) return NULL;
+    static char* kwlist[] = {"cx", "cy", "r", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii|s", kwlist, &cx, &cy, &r, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int y = cy - r; y <= cy + r; y++) {
         for (int x = cx - r; x <= cx + r; x++) {
@@ -169,10 +181,12 @@ static PyObject* get_filled_circle_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_rect_points(PyObject* self, PyObject* args) {
+static PyObject* get_rect_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int x1, y1, x2, y2;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iiii|s", &x1, &y1, &x2, &y2, &ch)) return NULL;
+    static char* kwlist[] = {"x1", "y1", "x2", "y2", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiii|s", kwlist, &x1, &y1, &x2, &y2, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int x = x1; x <= x2; x++) {
         PyObject* t1 = PyTuple_New(3);
@@ -205,10 +219,12 @@ static PyObject* get_rect_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_fill_rect_points(PyObject* self, PyObject* args) {
+static PyObject* get_fill_rect_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int x1, y1, x2, y2;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iiii|s", &x1, &y1, &x2, &y2, &ch)) return NULL;
+    static char* kwlist[] = {"x1", "y1", "x2", "y2", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiii|s", kwlist, &x1, &y1, &x2, &y2, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int y = y1; y <= y2; y++) {
         for (int x = x1; x <= x2; x++) {
@@ -223,10 +239,12 @@ static PyObject* get_fill_rect_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_triangle_points(PyObject* self, PyObject* args) {
+static PyObject* get_triangle_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int x1, y1, x2, y2, x3, y3;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iiiiii|s", &x1, &y1, &x2, &y2, &x3, &y3, &ch)) return NULL;
+    static char* kwlist[] = {"x1", "y1", "x2", "y2", "x3", "y3", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiiiii|s", kwlist, &x1, &y1, &x2, &y2, &x3, &y3, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     vector<pair<int,int>> pts;
     int dx = abs(x2 - x1), dy = abs(y2 - y1);
@@ -270,10 +288,12 @@ static PyObject* get_triangle_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_filled_triangle_points(PyObject* self, PyObject* args) {
+static PyObject* get_filled_triangle_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int x1, y1, x2, y2, x3, y3;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iiiiii|s", &x1, &y1, &x2, &y2, &x3, &y3, &ch)) return NULL;
+    static char* kwlist[] = {"x1", "y1", "x2", "y2", "x3", "y3", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiiiii|s", kwlist, &x1, &y1, &x2, &y2, &x3, &y3, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     int min_x = min(x1, min(x2, x3));
     int max_x = max(x1, max(x2, x3));
@@ -294,10 +314,12 @@ static PyObject* get_filled_triangle_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_heart_points(PyObject* self, PyObject* args) {
+static PyObject* get_heart_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int cx, cy, size = 5;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "ii|is", &cx, &cy, &size, &ch)) return NULL;
+    static char* kwlist[] = {"cx", "cy", "size", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|is", kwlist, &cx, &cy, &size, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int y = -size; y <= size; y++) {
         for (int x = -size; x <= size; x++) {
@@ -315,11 +337,12 @@ static PyObject* get_heart_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-
-static PyObject* get_star_points(PyObject* self, PyObject* args) {
+static PyObject* get_star_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int cx, cy, radius = 5, points_count = 5;
     const char* ch = "*";
-    if (!PyArg_ParseTuple(args, "ii|iis", &cx, &cy, &radius, &points_count, &ch)) return NULL;
+    static char* kwlist[] = {"cx", "cy", "radius", "points_count", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|iis", kwlist, &cx, &cy, &radius, &points_count, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     double angle = -M_PI / 2.0;
     double step = M_PI / points_count;
@@ -371,10 +394,12 @@ static PyObject* get_star_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_wave_points(PyObject* self, PyObject* args) {
+static PyObject* get_wave_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int cx, cy, amplitude = 5, length = 20;
     const char* ch = "~";
-    if (!PyArg_ParseTuple(args, "ii|iis", &cx, &cy, &amplitude, &length, &ch)) return NULL;
+    static char* kwlist[] = {"cx", "cy", "amplitude", "length", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|iis", kwlist, &cx, &cy, &amplitude, &length, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int x = 0; x < length; x++) {
         int y = cy + (int)(amplitude * sin(x * 0.5));
@@ -388,11 +413,13 @@ static PyObject* get_wave_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_spiral_points(PyObject* self, PyObject* args) {
+static PyObject* get_spiral_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int cx, cy, turns = 3, radius = 10;
     double step = 0.1;
     const char* ch = "*";
-    if (!PyArg_ParseTuple(args, "ii|iids", &cx, &cy, &turns, &radius, &step, &ch)) return NULL;
+    static char* kwlist[] = {"cx", "cy", "turns", "radius", "step", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|iids", kwlist, &cx, &cy, &turns, &radius, &step, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     double angle = 0, r = 0;
     while (r < radius) {
@@ -410,10 +437,12 @@ static PyObject* get_spiral_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_bezier_points(PyObject* self, PyObject* args) {
+static PyObject* get_bezier_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int x1, y1, x2, y2, x3, y3, steps = 20;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "iiiiii|is", &x1, &y1, &x2, &y2, &x3, &y3, &steps, &ch)) return NULL;
+    static char* kwlist[] = {"x1", "y1", "x2", "y2", "x3", "y3", "steps", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiiiii|is", kwlist, &x1, &y1, &x2, &y2, &x3, &y3, &steps, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int t = 0; t <= steps; t++) {
         double tt = (double)t / steps;
@@ -429,10 +458,12 @@ static PyObject* get_bezier_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_grid_points(PyObject* self, PyObject* args) {
+static PyObject* get_grid_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int x1, y1, x2, y2, step = 2;
     const char* ch = "+";
-    if (!PyArg_ParseTuple(args, "iiii|is", &x1, &y1, &x2, &y2, &step, &ch)) return NULL;
+    static char* kwlist[] = {"x1", "y1", "x2", "y2", "step", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiii|is", kwlist, &x1, &y1, &x2, &y2, &step, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int x = x1; x <= x2; x += step) {
         for (int y = y1; y <= y2; y += step) {
@@ -447,10 +478,12 @@ static PyObject* get_grid_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_noise_points(PyObject* self, PyObject* args) {
+static PyObject* get_noise_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int cx, cy, radius, count = 50;
     const char* ch = ".";
-    if (!PyArg_ParseTuple(args, "iii|is", &cx, &cy, &radius, &count, &ch)) return NULL;
+    static char* kwlist[] = {"cx", "cy", "radius", "count", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii|is", kwlist, &cx, &cy, &radius, &count, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     srand(time(NULL));
     for (int i = 0; i < count; i++) {
@@ -468,12 +501,14 @@ static PyObject* get_noise_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_cube_3d_points(PyObject* self, PyObject* args) {
+static PyObject* get_cube_3d_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int size = 5;
     double rotx = 0, roty = 0, rotz = 0, scale = 10.0;
     int cx = 40, cy = 12;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "|iddddis", &size, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch)) return NULL;
+    static char* kwlist[] = {"size", "rotx", "roty", "rotz", "scale", "cx", "cy", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iddddis", kwlist, &size, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     double s = size / 2.0;
     Vec3 vertices[8] = {
@@ -511,12 +546,14 @@ static PyObject* get_cube_3d_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_sphere_3d_points(PyObject* self, PyObject* args) {
+static PyObject* get_sphere_3d_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int radius = 5, segments = 12;
     double rotx = 0, roty = 0, rotz = 0, scale = 10.0;
     int cx = 40, cy = 12;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "|iidddis", &radius, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch)) return NULL;
+    static char* kwlist[] = {"radius", "segments", "rotx", "roty", "rotz", "scale", "cx", "cy", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iidddis", kwlist, &radius, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int i = 0; i < segments; i++) {
         double theta = (double)i / segments * M_PI;
@@ -536,12 +573,15 @@ static PyObject* get_sphere_3d_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_cylinder_3d_points(PyObject* self, PyObject* args) {
+
+static PyObject* get_cylinder_3d_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int radius = 5, height = 10, segments = 12;
     double rotx = 0, roty = 0, rotz = 0, scale = 10.0;
     int cx = 40, cy = 12;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "|iiidddis", &radius, &height, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch)) return NULL;
+    static char* kwlist[] = {"radius", "height", "segments", "rotx", "roty", "rotz", "scale", "cx", "cy", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iiidddis", kwlist, &radius, &height, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     Vec3 top[100], bottom[100];
     for (int i = 0; i < segments; i++) {
@@ -613,12 +653,14 @@ static PyObject* get_cylinder_3d_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_cone_3d_points(PyObject* self, PyObject* args) {
+static PyObject* get_cone_3d_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int radius = 5, height = 10, segments = 12;
     double rotx = 0, roty = 0, rotz = 0, scale = 10.0;
     int cx = 40, cy = 12;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "|iiidddis", &radius, &height, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch)) return NULL;
+    static char* kwlist[] = {"radius", "height", "segments", "rotx", "roty", "rotz", "scale", "cx", "cy", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iiidddis", kwlist, &radius, &height, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     Vec3 base[100];
     for (int i = 0; i < segments; i++) {
@@ -671,12 +713,14 @@ static PyObject* get_cone_3d_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_torus_3d_points(PyObject* self, PyObject* args) {
+static PyObject* get_torus_3d_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int radius = 8, tube = 3, segments = 16;
     double rotx = 0, roty = 0, rotz = 0, scale = 10.0;
     int cx = 40, cy = 12;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "|iiidddis", &radius, &tube, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch)) return NULL;
+    static char* kwlist[] = {"radius", "tube", "segments", "rotx", "roty", "rotz", "scale", "cx", "cy", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iiidddis", kwlist, &radius, &tube, &segments, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     for (int i = 0; i < segments; i++) {
         double theta = (double)i / segments * 2 * M_PI;
@@ -696,12 +740,14 @@ static PyObject* get_torus_3d_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* get_ico_sphere_3d_points(PyObject* self, PyObject* args) {
+static PyObject* get_ico_sphere_3d_points(PyObject* self, PyObject* args, PyObject* kwargs) {
     int radius = 5;
     double rotx = 0, roty = 0, rotz = 0, scale = 10.0;
     int cx = 40, cy = 12;
     const char* ch = "#";
-    if (!PyArg_ParseTuple(args, "|idddis", &radius, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch)) return NULL;
+    static char* kwlist[] = {"radius", "rotx", "roty", "rotz", "scale", "cx", "cy", "char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|idddis", kwlist, &radius, &rotx, &roty, &rotz, &scale, &cx, &cy, &ch))
+        return NULL;
     PyObject* list = PyList_New(0);
     double phi = (1 + sqrt(5)) / 2.0;
     Vec3 verts[12] = {
@@ -751,11 +797,13 @@ static PyObject* get_ico_sphere_3d_points(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* DrawPic(PyObject* self, PyObject* args) {
+static PyObject* DrawPic(PyObject* self, PyObject* args, PyObject* kwargs) {
     PyObject* points = NULL;
     int width = 80, height = 25, clear_before = 0;
     const char* default_char = " ";
-    if (!PyArg_ParseTuple(args, "|Oiiis", &points, &width, &height, &clear_before, &default_char)) return NULL;
+    static char* kwlist[] = {"points", "width", "height", "clear_before", "default_char", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oiiis", kwlist, &points, &width, &height, &clear_before, &default_char))
+        return NULL;
     if (clear_before) {
         #ifdef _WIN32
         system("cls");
@@ -788,7 +836,7 @@ static PyObject* DrawPic(PyObject* self, PyObject* args) {
     Py_RETURN_NONE;
 }
 
-static PyObject* GetKey(PyObject* self, PyObject* args) {
+static PyObject* GetKey(PyObject* self, PyObject* args, PyObject* kwargs) {
     #ifdef _WIN32
     int ch = _getch();
     #else
@@ -803,19 +851,23 @@ static PyObject* GetKey(PyObject* self, PyObject* args) {
     return PyUnicode_FromStringAndSize(&ch, 1);
 }
 
-static PyObject* StartPyCode(PyObject* self, PyObject* args) {
+static PyObject* StartPyCode(PyObject* self, PyObject* args, PyObject* kwargs) {
     const char* code;
     int wait = 0;
-    if (!PyArg_ParseTuple(args, "s|i", &code, &wait)) return NULL;
+    static char* kwlist[] = {"code", "wait", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i", kwlist, &code, &wait))
+        return NULL;
     string cmd = "python -c \"" + string(code) + "\"";
     if (!wait) cmd += " &";
     int result = system(cmd.c_str());
     return PyLong_FromLong(result);
 }
 
-static PyObject* KillPyScript(PyObject* self, PyObject* args) {
+static PyObject* KillPyScript(PyObject* self, PyObject* args, PyObject* kwargs) {
     int pid;
-    if (!PyArg_ParseTuple(args, "i", &pid)) return NULL;
+    static char* kwlist[] = {"pid", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pid))
+        return NULL;
     #ifdef _WIN32
     string cmd = "taskkill /PID " + to_string(pid);
     #else
@@ -825,9 +877,11 @@ static PyObject* KillPyScript(PyObject* self, PyObject* args) {
     return PyLong_FromLong(result);
 }
 
-static PyObject* IsRunning(PyObject* self, PyObject* args) {
+static PyObject* IsRunning(PyObject* self, PyObject* args, PyObject* kwargs) {
     int pid;
-    if (!PyArg_ParseTuple(args, "i", &pid)) return NULL;
+    static char* kwlist[] = {"pid", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pid))
+        return NULL;
     #ifdef _WIN32
     HANDLE process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
     if (process) {
@@ -843,7 +897,7 @@ static PyObject* IsRunning(PyObject* self, PyObject* args) {
     #endif
 }
 
-static PyObject* GetCurrentPID(PyObject* self, PyObject* args) {
+static PyObject* GetCurrentPID(PyObject* self, PyObject* args, PyObject* kwargs) {
     #ifdef _WIN32
     return PyLong_FromLong(GetCurrentProcessId());
     #else
@@ -851,10 +905,11 @@ static PyObject* GetCurrentPID(PyObject* self, PyObject* args) {
     #endif
 }
 
-static PyObject* WaitForProcess(PyObject* self, PyObject* args) {
-    int pid;
-    int timeout = -1;
-    if (!PyArg_ParseTuple(args, "i|i", &pid, &timeout)) return NULL;
+static PyObject* WaitForProcess(PyObject* self, PyObject* args, PyObject* kwargs) {
+    int pid, timeout = -1;
+    static char* kwlist[] = {"pid", "timeout", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, &pid, &timeout))
+        return NULL;
     int elapsed = 0;
     while (true) {
         #ifdef _WIN32
@@ -874,7 +929,7 @@ static PyObject* WaitForProcess(PyObject* self, PyObject* args) {
     }
 }
 
-static PyObject* GetProcessList(PyObject* self, PyObject* args) {
+static PyObject* GetProcessList(PyObject* self, PyObject* args, PyObject* kwargs) {
     PyObject* list = PyList_New(0);
     #ifdef _WIN32
     PyObject* tuple = PyTuple_New(2);
@@ -905,9 +960,11 @@ static PyObject* GetProcessList(PyObject* self, PyObject* args) {
     return list;
 }
 
-static PyObject* GetProcessInfo(PyObject* self, PyObject* args) {
+static PyObject* GetProcessInfo(PyObject* self, PyObject* args, PyObject* kwargs) {
     int pid;
-    if (!PyArg_ParseTuple(args, "i", &pid)) return NULL;
+    static char* kwlist[] = {"pid", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &pid))
+        return NULL;
     #ifdef _WIN32
     return PyUnicode_FromString("Not implemented on Windows");
     #else
@@ -935,7 +992,7 @@ static PyObject* GetProcessInfo(PyObject* self, PyObject* args) {
     #endif
 }
 
-static PyObject* clear_screen(PyObject* self, PyObject* args) {
+static PyObject* clear_screen(PyObject* self, PyObject* args, PyObject* kwargs) {
     #ifdef _WIN32
     system("cls");
     #else
@@ -944,11 +1001,13 @@ static PyObject* clear_screen(PyObject* self, PyObject* args) {
     Py_RETURN_NONE;
 }
 
-static PyObject* animate_print(PyObject* self, PyObject* args) {
+static PyObject* animate_print(PyObject* self, PyObject* args, PyObject* kwargs) {
     const char* text;
     double delay = 0.05;
     int backspace = 0;
-    if (!PyArg_ParseTuple(args, "s|di", &text, &delay, &backspace)) return NULL;
+    static char* kwlist[] = {"text", "delay", "backspace", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|di", kwlist, &text, &delay, &backspace))
+        return NULL;
     if (backspace) {
         for (int i = 0; text[i]; i++) {
             cout << text[i] << flush;
@@ -973,12 +1032,14 @@ static PyObject* animate_print(PyObject* self, PyObject* args) {
     Py_RETURN_NONE;
 }
 
-static PyObject* spinning_cursor(PyObject* self, PyObject* args) {
+static PyObject* spinning_cursor(PyObject* self, PyObject* args, PyObject* kwargs) {
     const char* message = "Loading";
     double duration = 3.0, delay = 0.1;
     int clear_before = 0;
-    if (!PyArg_ParseTuple(args, "|sddi", &message, &duration, &delay, &clear_before)) return NULL;
-    if (clear_before) clear_screen(NULL, NULL);
+    static char* kwlist[] = {"message", "duration", "delay", "clear_before", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|sddi", kwlist, &message, &duration, &delay, &clear_before))
+        return NULL;
+    if (clear_before) clear_screen(NULL, NULL, NULL);
     vector<string> frames = {"|", "/", "-", "\\"};
     double end_time = time(NULL) + duration;
     int idx = 0;
@@ -991,12 +1052,14 @@ static PyObject* spinning_cursor(PyObject* self, PyObject* args) {
     Py_RETURN_NONE;
 }
 
-static PyObject* countdown(PyObject* self, PyObject* args) {
+static PyObject* countdown(PyObject* self, PyObject* args, PyObject* kwargs) {
     int seconds;
     const char* message = "Countdown";
     int clear_before = 0;
-    if (!PyArg_ParseTuple(args, "i|si", &seconds, &message, &clear_before)) return NULL;
-    if (clear_before) clear_screen(NULL, NULL);
+    static char* kwlist[] = {"seconds", "message", "clear_before", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|si", kwlist, &seconds, &message, &clear_before))
+        return NULL;
+    if (clear_before) clear_screen(NULL, NULL, NULL);
     for (int i = seconds; i > 0; i--) {
         cout << "\r" << message << ": " << i << " seconds remaining " << flush;
         this_thread::sleep_for(chrono::seconds(1));
@@ -1005,7 +1068,7 @@ static PyObject* countdown(PyObject* self, PyObject* args) {
     Py_RETURN_NONE;
 }
 
-static PyObject* GetPipVer(PyObject* self, PyObject* args) {
+static PyObject* GetPipVer(PyObject* self, PyObject* args, PyObject* kwargs) {
     #ifdef _WIN32
     FILE* fp = _popen("python -m pip --version", "r");
     #else
@@ -1030,10 +1093,12 @@ static PyObject* GetPipVer(PyObject* self, PyObject* args) {
 }
 
 #ifdef _WIN32
-static PyObject* Connect(PyObject* self, PyObject* args) {
+static PyObject* Connect(PyObject* self, PyObject* args, PyObject* kwargs) {
     const char* host = "127.0.0.1";
     int port = 54321;
-    if (!PyArg_ParseTuple(args, "|si", &host, &port)) return NULL;
+    static char* kwlist[] = {"host", "port", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|si", kwlist, &host, &port))
+        return NULL;
     WSADATA wsaData;
     WSAStartup(MAKEWORD(2,2), &wsaData);
     int sock = socket(AF_INET, SOCK_STREAM, 0);
@@ -1053,10 +1118,12 @@ static PyObject* Connect(PyObject* self, PyObject* args) {
     return PyLong_FromLong(sock);
 }
 #else
-static PyObject* Connect(PyObject* self, PyObject* args) {
+static PyObject* Connect(PyObject* self, PyObject* args, PyObject* kwargs) {
     const char* host = "127.0.0.1";
     int port = 54321;
-    if (!PyArg_ParseTuple(args, "|si", &host, &port)) return NULL;
+    static char* kwlist[] = {"host", "port", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|si", kwlist, &host, &port))
+        return NULL;
     int sock = socket(AF_INET, SOCK_STREAM, 0);
     if (sock < 0) return PyLong_FromLong(-1);
     struct sockaddr_in server;
@@ -1071,9 +1138,11 @@ static PyObject* Connect(PyObject* self, PyObject* args) {
 }
 #endif
 
-static PyObject* ConnectPublic(PyObject* self, PyObject* args) {
+static PyObject* ConnectPublic(PyObject* self, PyObject* args, PyObject* kwargs) {
     int port = 54321;
-    if (!PyArg_ParseTuple(args, "|i", &port)) return NULL;
+    static char* kwlist[] = {"port", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &port))
+        return NULL;
     #ifdef _WIN32
     WSADATA wsaData;
     WSAStartup(MAKEWORD(2,2), &wsaData);
@@ -1123,18 +1192,21 @@ static PyObject* ConnectPublic(PyObject* self, PyObject* args) {
     return PyUnicode_FromString("");
 }
 
-static PyObject* Send(PyObject* self, PyObject* args) {
+static PyObject* Send(PyObject* self, PyObject* args, PyObject* kwargs) {
     int sock;
     const char* message;
-    if (!PyArg_ParseTuple(args, "is", &sock, &message)) return NULL;
+    static char* kwlist[] = {"sock", "message", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "is", kwlist, &sock, &message))
+        return NULL;
     int result = send(sock, message, strlen(message), 0);
     return PyLong_FromLong(result);
 }
 
-static PyObject* Receive(PyObject* self, PyObject* args) {
-    int sock;
-    int size = 1024;
-    if (!PyArg_ParseTuple(args, "i|i", &sock, &size)) return NULL;
+static PyObject* Receive(PyObject* self, PyObject* args, PyObject* kwargs) {
+    int sock, size = 1024;
+    static char* kwlist[] = {"sock", "size", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, &sock, &size))
+        return NULL;
     char* buffer = (char*)malloc(size + 1);
     int result = recv(sock, buffer, size, 0);
     if (result > 0) {
@@ -1147,9 +1219,11 @@ static PyObject* Receive(PyObject* self, PyObject* args) {
     return PyUnicode_FromString("");
 }
 
-static PyObject* Disconnect(PyObject* self, PyObject* args) {
+static PyObject* Disconnect(PyObject* self, PyObject* args, PyObject* kwargs) {
     int sock;
-    if (!PyArg_ParseTuple(args, "i", &sock)) return NULL;
+    static char* kwlist[] = {"sock", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &sock))
+        return NULL;
     #ifdef _WIN32
     closesocket(sock);
     WSACleanup();
@@ -1159,14 +1233,16 @@ static PyObject* Disconnect(PyObject* self, PyObject* args) {
     Py_RETURN_NONE;
 }
 
-static PyObject* GetPublicIP(PyObject* self, PyObject* args) {
-    PyObject* ip = ConnectPublic(self, args);
+static PyObject* GetPublicIP(PyObject* self, PyObject* args, PyObject* kwargs) {
+    PyObject* ip = ConnectPublic(self, args, kwargs);
     return ip;
 }
 
-static PyObject* CreateServer(PyObject* self, PyObject* args) {
+static PyObject* CreateServer(PyObject* self, PyObject* args, PyObject* kwargs) {
     int port = 54321;
-    if (!PyArg_ParseTuple(args, "|i", &port)) return NULL;
+    static char* kwlist[] = {"port", NULL};
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &port))
+        return NULL;
     #ifdef _WIN32
     WSADATA wsaData;
     WSAStartup(MAKEWORD(2,2), &wsaData);
@@ -1205,49 +1281,49 @@ static PyObject* CreateServer(PyObject* self, PyObject* args) {
 }
 
 static PyMethodDef CoreMethods[] = {
-    {"rgb", rgb, METH_VARARGS, "RGB color"},
-    {"bg_rgb", bg_rgb, METH_VARARGS, "RGB background"},
-    {"colorize", colorize, METH_VARARGS, "Colorize text"},
-    {"get_line_points", get_line_points, METH_VARARGS, "Get line points"},
-    {"get_circle_points", get_circle_points, METH_VARARGS, "Get circle points"},
-    {"get_filled_circle_points", get_filled_circle_points, METH_VARARGS, "Get filled circle points"},
-    {"get_rect_points", get_rect_points, METH_VARARGS, "Get rectangle points"},
-    {"get_fill_rect_points", get_fill_rect_points, METH_VARARGS, "Get filled rectangle points"},
-    {"get_triangle_points", get_triangle_points, METH_VARARGS, "Get triangle points"},
-    {"get_filled_triangle_points", get_filled_triangle_points, METH_VARARGS, "Get filled triangle points"},
-    {"get_heart_points", get_heart_points, METH_VARARGS, "Get heart points"},
-    {"get_star_points", get_star_points, METH_VARARGS, "Get star points"},
-    {"get_wave_points", get_wave_points, METH_VARARGS, "Get wave points"},
-    {"get_spiral_points", get_spiral_points, METH_VARARGS, "Get spiral points"},
-    {"get_bezier_points", get_bezier_points, METH_VARARGS, "Get bezier points"},
-    {"get_grid_points", get_grid_points, METH_VARARGS, "Get grid points"},
-    {"get_noise_points", get_noise_points, METH_VARARGS, "Get noise points"},
-    {"get_cube_3d_points", get_cube_3d_points, METH_VARARGS, "Get 3D cube points"},
-    {"get_sphere_3d_points", get_sphere_3d_points, METH_VARARGS, "Get 3D sphere points"},
-    {"get_cylinder_3d_points", get_cylinder_3d_points, METH_VARARGS, "Get 3D cylinder points"},
-    {"get_cone_3d_points", get_cone_3d_points, METH_VARARGS, "Get 3D cone points"},
-    {"get_torus_3d_points", get_torus_3d_points, METH_VARARGS, "Get 3D torus points"},
-    {"get_ico_sphere_3d_points", get_ico_sphere_3d_points, METH_VARARGS, "Get 3D ico sphere points"},
-    {"DrawPic", DrawPic, METH_VARARGS, "Draw points"},
-    {"GetKey", GetKey, METH_VARARGS, "Get key without Enter"},
-    {"StartPyCode", StartPyCode, METH_VARARGS, "Start Python code"},
-    {"KillPyScript", KillPyScript, METH_VARARGS, "Kill Python script"},
-    {"IsRunning", IsRunning, METH_VARARGS, "Check if process is running"},
-    {"GetCurrentPID", GetCurrentPID, METH_VARARGS, "Get current PID"},
-    {"WaitForProcess", WaitForProcess, METH_VARARGS, "Wait for process"},
-    {"GetProcessList", GetProcessList, METH_VARARGS, "Get process list"},
-    {"GetProcessInfo", GetProcessInfo, METH_VARARGS, "Get process info"},
-    {"clear_screen", clear_screen, METH_VARARGS, "Clear screen"},
-    {"animate_print", animate_print, METH_VARARGS, "Animate print"},
-    {"spinning_cursor", spinning_cursor, METH_VARARGS, "Spinning cursor"},
-    {"countdown", countdown, METH_VARARGS, "Countdown"},
-    {"GetPipVer", GetPipVer, METH_VARARGS, "Get pip version"},
-    {"Connect", Connect, METH_VARARGS, "Connect to server"},
-    {"Send", Send, METH_VARARGS, "Send message"},
-    {"Receive", Receive, METH_VARARGS, "Receive message"},
-    {"Disconnect", Disconnect, METH_VARARGS, "Disconnect"},
-    {"GetPublicIP", GetPublicIP, METH_VARARGS, "Get public IP"},
-    {"CreateServer", CreateServer, METH_VARARGS, "Create server"},
+    {"rgb", (PyCFunction)rgb, METH_VARARGS | METH_KEYWORDS, "RGB color"},
+    {"bg_rgb", (PyCFunction)bg_rgb, METH_VARARGS | METH_KEYWORDS, "RGB background"},
+    {"colorize", (PyCFunction)colorize, METH_VARARGS | METH_KEYWORDS, "Colorize text"},
+    {"get_line_points", (PyCFunction)get_line_points, METH_VARARGS | METH_KEYWORDS, "Get line points"},
+    {"get_circle_points", (PyCFunction)get_circle_points, METH_VARARGS | METH_KEYWORDS, "Get circle points"},
+    {"get_filled_circle_points", (PyCFunction)get_filled_circle_points, METH_VARARGS | METH_KEYWORDS, "Get filled circle points"},
+    {"get_rect_points", (PyCFunction)get_rect_points, METH_VARARGS | METH_KEYWORDS, "Get rectangle points"},
+    {"get_fill_rect_points", (PyCFunction)get_fill_rect_points, METH_VARARGS | METH_KEYWORDS, "Get filled rectangle points"},
+    {"get_triangle_points", (PyCFunction)get_triangle_points, METH_VARARGS | METH_KEYWORDS, "Get triangle points"},
+    {"get_filled_triangle_points", (PyCFunction)get_filled_triangle_points, METH_VARARGS | METH_KEYWORDS, "Get filled triangle points"},
+    {"get_heart_points", (PyCFunction)get_heart_points, METH_VARARGS | METH_KEYWORDS, "Get heart points"},
+    {"get_star_points", (PyCFunction)get_star_points, METH_VARARGS | METH_KEYWORDS, "Get star points"},
+    {"get_wave_points", (PyCFunction)get_wave_points, METH_VARARGS | METH_KEYWORDS, "Get wave points"},
+    {"get_spiral_points", (PyCFunction)get_spiral_points, METH_VARARGS | METH_KEYWORDS, "Get spiral points"},
+    {"get_bezier_points", (PyCFunction)get_bezier_points, METH_VARARGS | METH_KEYWORDS, "Get bezier points"},
+    {"get_grid_points", (PyCFunction)get_grid_points, METH_VARARGS | METH_KEYWORDS, "Get grid points"},
+    {"get_noise_points", (PyCFunction)get_noise_points, METH_VARARGS | METH_KEYWORDS, "Get noise points"},
+    {"get_cube_3d_points", (PyCFunction)get_cube_3d_points, METH_VARARGS | METH_KEYWORDS, "Get 3D cube points"},
+    {"get_sphere_3d_points", (PyCFunction)get_sphere_3d_points, METH_VARARGS | METH_KEYWORDS, "Get 3D sphere points"},
+    {"get_cylinder_3d_points", (PyCFunction)get_cylinder_3d_points, METH_VARARGS | METH_KEYWORDS, "Get 3D cylinder points"},
+    {"get_cone_3d_points", (PyCFunction)get_cone_3d_points, METH_VARARGS | METH_KEYWORDS, "Get 3D cone points"},
+    {"get_torus_3d_points", (PyCFunction)get_torus_3d_points, METH_VARARGS | METH_KEYWORDS, "Get 3D torus points"},
+    {"get_ico_sphere_3d_points", (PyCFunction)get_ico_sphere_3d_points, METH_VARARGS | METH_KEYWORDS, "Get 3D ico sphere points"},
+    {"DrawPic", (PyCFunction)DrawPic, METH_VARARGS | METH_KEYWORDS, "Draw points"},
+    {"GetKey", (PyCFunction)GetKey, METH_VARARGS | METH_KEYWORDS, "Get key without Enter"},
+    {"StartPyCode", (PyCFunction)StartPyCode, METH_VARARGS | METH_KEYWORDS, "Start Python code"},
+    {"KillPyScript", (PyCFunction)KillPyScript, METH_VARARGS | METH_KEYWORDS, "Kill Python script"},
+    {"IsRunning", (PyCFunction)IsRunning, METH_VARARGS | METH_KEYWORDS, "Check if process is running"},
+    {"GetCurrentPID", (PyCFunction)GetCurrentPID, METH_VARARGS | METH_KEYWORDS, "Get current PID"},
+    {"WaitForProcess", (PyCFunction)WaitForProcess, METH_VARARGS | METH_KEYWORDS, "Wait for process"},
+    {"GetProcessList", (PyCFunction)GetProcessList, METH_VARARGS | METH_KEYWORDS, "Get process list"},
+    {"GetProcessInfo", (PyCFunction)GetProcessInfo, METH_VARARGS | METH_KEYWORDS, "Get process info"},
+    {"clear_screen", (PyCFunction)clear_screen, METH_VARARGS | METH_KEYWORDS, "Clear screen"},
+    {"animate_print", (PyCFunction)animate_print, METH_VARARGS | METH_KEYWORDS, "Animate print"},
+    {"spinning_cursor", (PyCFunction)spinning_cursor, METH_VARARGS | METH_KEYWORDS, "Spinning cursor"},
+    {"countdown", (PyCFunction)countdown, METH_VARARGS | METH_KEYWORDS, "Countdown"},
+    {"GetPipVer", (PyCFunction)GetPipVer, METH_VARARGS | METH_KEYWORDS, "Get pip version"},
+    {"Connect", (PyCFunction)Connect, METH_VARARGS | METH_KEYWORDS, "Connect to server"},
+    {"Send", (PyCFunction)Send, METH_VARARGS | METH_KEYWORDS, "Send message"},
+    {"Receive", (PyCFunction)Receive, METH_VARARGS | METH_KEYWORDS, "Receive message"},
+    {"Disconnect", (PyCFunction)Disconnect, METH_VARARGS | METH_KEYWORDS, "Disconnect"},
+    {"GetPublicIP", (PyCFunction)GetPublicIP, METH_VARARGS | METH_KEYWORDS, "Get public IP"},
+    {"CreateServer", (PyCFunction)CreateServer, METH_VARARGS | METH_KEYWORDS, "Create server"},
     {NULL, NULL, 0, NULL}
 };
 

{consoleframework-1.3.0 → consoleframework-1.3.1}/ConsoleFramework.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ConsoleFramework
-Version: 1.3.0
+Version: 1.3.1
 Summary: The best Console Library of the Python.
 Author: Suleiman
 Author-email: steal.apet@mail.ru

{consoleframework-1.3.0 → consoleframework-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ConsoleFramework
-Version: 1.3.0
+Version: 1.3.1
 Summary: The best Console Library of the Python.
 Author: Suleiman
 Author-email: steal.apet@mail.ru

{consoleframework-1.3.0 → consoleframework-1.3.1}/setup.py

@@ -11,7 +11,7 @@ ext_modules = [
 
 setup(
     name="ConsoleFramework",
-    version="1.3.0",
+    version="1.3.1",
     description="The best Console Library of the Python.",
     long_description="ConsoleFramework - C++ library for Python console rendering.",
     long_description_content_type="text/plain",