mirror of
https://github.com/Hopiu/linkchecker.git
synced 2026-04-02 06:00:39 +00:00
updated
git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@2152 e7d03fd6-7b0d-0410-9947-9c21f3af8025
This commit is contained in:
calvin
parent
edfea898b4
commit
83020982ba
2 changed files with 108 additions and 83 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -10,6 +10,20 @@
|
|||
Type: feature
|
||||
Changed: install-rpm.sh
|
||||
|
||||
* HTML parser updates:
|
||||
- supply and use Py_CLEAR macro
|
||||
- only call set_encoding function if tag name is 'meta'
|
||||
Type: feature
|
||||
Changed: linkcheck/HtmlParser/*
|
||||
|
||||
* Changed documentation format for epydoc.
|
||||
Type: documentation
|
||||
Changed: *.py
|
||||
|
||||
* Fix FTP error message display crash.
|
||||
Type: bugfix
|
||||
Changed: linkcheck/checker/ftpurl.py
|
||||
|
||||
2.1 "Shogun Assassin" (released 11.1.2005)
|
||||
|
||||
* Added XHTML support to the HTML parser.
|
||||
|
|
|
|||
|
|
@ -137,39 +137,40 @@ static PyObject* list_dict;
|
|||
static PyObject* set_encoding;
|
||||
/* set_doctype helper function */
|
||||
static PyObject* set_doctype;
|
||||
/* the unicode string u'meta' */
|
||||
static PyObject* u_meta;
|
||||
|
||||
/* macros for easier scanner state manipulation */
|
||||
|
||||
/* clear buffer b, returning NULL on error */
|
||||
#define CLEAR_BUF(b) \
|
||||
b = PyMem_Resize(b, char, 1); \
|
||||
if (b==NULL) return NULL; \
|
||||
if (b == NULL) return NULL; \
|
||||
(b)[0] = '\0'
|
||||
|
||||
/* clear buffer b, returning NULL and decref self on error */
|
||||
#define CLEAR_BUF_DECREF(self, b) \
|
||||
b = PyMem_Resize(b, char, 1); \
|
||||
if (b==NULL) { Py_DECREF(self); return NULL; } \
|
||||
if (b == NULL) { Py_DECREF(self); return NULL; } \
|
||||
(b)[0] = '\0'
|
||||
|
||||
#define CHECK_ERROR(ud, label) \
|
||||
if (ud->error && PyObject_HasAttrString(ud->handler, "error")==1) { \
|
||||
if (ud->error && PyObject_HasAttrString(ud->handler, "error") == 1) { \
|
||||
callback = PyObject_GetAttrString(ud->handler, "error"); \
|
||||
if (!callback) { error=1; goto label; } \
|
||||
if (!callback) { error = 1; goto label; } \
|
||||
result = PyObject_CallFunction(callback, "O", ud->error); \
|
||||
if (!result) { error=1; goto label; } \
|
||||
if (!result) { error = 1; goto label; } \
|
||||
}
|
||||
|
||||
/* generic callback macro */
|
||||
#define CALLBACK(ud, attr, format, arg, label) \
|
||||
if (PyObject_HasAttrString(ud->handler, attr)==1) { \
|
||||
if (PyObject_HasAttrString(ud->handler, attr) == 1) { \
|
||||
callback = PyObject_GetAttrString(ud->handler, attr); \
|
||||
if (callback==NULL) { error=1; goto label; } \
|
||||
if (callback == NULL) { error = 1; goto label; } \
|
||||
result = PyObject_CallFunction(callback, format, arg); \
|
||||
if (result==NULL) { error=1; goto label; } \
|
||||
Py_DECREF(callback); \
|
||||
Py_DECREF(result); \
|
||||
callback=result=NULL; \
|
||||
if (result == NULL) { error = 1; goto label; } \
|
||||
Py_CLEAR(callback); \
|
||||
Py_CLEAR(result); \
|
||||
}
|
||||
|
||||
/* set old line and column */
|
||||
|
|
@ -202,10 +203,10 @@ static int html_end_tag (PyObject* ptag, PyObject* parser) {
|
|||
char* doctype;
|
||||
int ret = 1;
|
||||
pdoctype = PyObject_GetAttrString(parser, "doctype");
|
||||
if (pdoctype==NULL) return -1;
|
||||
if (pdoctype == NULL) return -1;
|
||||
doctype = PyString_AsString(pdoctype);
|
||||
if (doctype == NULL) { Py_DECREF(pdoctype); return -1; }
|
||||
if (strcmp(doctype, "HTML")==0) {
|
||||
if (strcmp(doctype, "HTML") == 0) {
|
||||
char* tag = PyString_AsString(ptag);
|
||||
if (tag == NULL) { Py_DECREF(pdoctype); return -1; }
|
||||
ret = strcmp(tag, "area")!=0 &&
|
||||
|
|
@ -255,7 +256,7 @@ typedef int YYSTYPE;
|
|||
|
||||
|
||||
/* Line 214 of yacc.c. */
|
||||
#line 259 "htmlparse.c"
|
||||
#line 260 "htmlparse.c"
|
||||
|
||||
#if ! defined (yyoverflow) || YYERROR_VERBOSE
|
||||
|
||||
|
|
@ -432,8 +433,8 @@ static const yysigned_char yyrhs[] =
|
|||
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
|
||||
static const unsigned short int yyrline[] =
|
||||
{
|
||||
0, 169, 169, 170, 173, 174, 181, 220, 267, 301,
|
||||
322, 343, 364, 389, 414, 439
|
||||
0, 170, 170, 171, 174, 175, 182, 225, 276, 309,
|
||||
330, 351, 372, 397, 422, 447
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
@ -1139,22 +1140,22 @@ yyreduce:
|
|||
switch (yyn)
|
||||
{
|
||||
case 2:
|
||||
#line 169 "htmlparse.y"
|
||||
{;}
|
||||
break;
|
||||
|
||||
case 3:
|
||||
#line 170 "htmlparse.y"
|
||||
{;}
|
||||
break;
|
||||
|
||||
case 3:
|
||||
#line 171 "htmlparse.y"
|
||||
{;}
|
||||
break;
|
||||
|
||||
case 4:
|
||||
#line 173 "htmlparse.y"
|
||||
#line 174 "htmlparse.y"
|
||||
{ YYACCEPT; /* wait for more lexer input */ ;}
|
||||
break;
|
||||
|
||||
case 5:
|
||||
#line 175 "htmlparse.y"
|
||||
#line 176 "htmlparse.y"
|
||||
{
|
||||
/* an error occured in the scanner, the python exception must be set */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1164,7 +1165,7 @@ yyreduce:
|
|||
break;
|
||||
|
||||
case 6:
|
||||
#line 182 "htmlparse.y"
|
||||
#line 183 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyTuple (<tag>, <attrs>)
|
||||
<tag> is a PyObject, <attrs> is a PyDict */
|
||||
|
|
@ -1174,19 +1175,23 @@ yyreduce:
|
|||
PyObject* tag = PyTuple_GET_ITEM(yyvsp[0], 0);
|
||||
PyObject* attrs = PyTuple_GET_ITEM(yyvsp[0], 1);
|
||||
int error = 0;
|
||||
if (tag==NULL || attrs==NULL) { error = 1; goto finish_start; }
|
||||
/* set encoding */
|
||||
result = PyObject_CallFunction(set_encoding, "OOO", ud->parser, tag, attrs);
|
||||
if (result==NULL) { error=1; goto finish_start; }
|
||||
Py_DECREF(result); result = NULL;
|
||||
if (PyObject_HasAttrString(ud->handler, "start_element")==1) {
|
||||
int cmp;
|
||||
if (tag == NULL || attrs == NULL) { error = 1; goto finish_start; }
|
||||
cmp = PyObject_RichCompareBool(tag, u_meta, Py_EQ);
|
||||
if (cmp == -1) { error = 1; goto finish_start; }
|
||||
if (cmp == 1) {
|
||||
/* set encoding */
|
||||
result = PyObject_CallFunction(set_encoding, "OO", ud->parser, attrs);
|
||||
if (result == NULL) { error = 1; goto finish_start; }
|
||||
Py_CLEAR(result);
|
||||
}
|
||||
if (PyObject_HasAttrString(ud->handler, "start_element") == 1) {
|
||||
callback = PyObject_GetAttrString(ud->handler, "start_element");
|
||||
if (!callback) { error=1; goto finish_start; }
|
||||
if (!callback) { error = 1; goto finish_start; }
|
||||
result = PyObject_CallFunction(callback, "OO", tag, attrs);
|
||||
if (!result) { error=1; goto finish_start; }
|
||||
Py_DECREF(callback);
|
||||
Py_DECREF(result);
|
||||
callback = result = NULL;
|
||||
if (!result) { error = 1; goto finish_start; }
|
||||
Py_CLEAR(callback);
|
||||
Py_CLEAR(result);
|
||||
}
|
||||
CHECK_ERROR(ud, finish_start);
|
||||
finish_start:
|
||||
|
|
@ -1206,7 +1211,7 @@ finish_start:
|
|||
break;
|
||||
|
||||
case 7:
|
||||
#line 221 "htmlparse.y"
|
||||
#line 226 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyTuple (<tag>, <attrs>)
|
||||
<tag> is a PyObject, <attrs> is a PyDict */
|
||||
|
|
@ -1216,27 +1221,31 @@ finish_start:
|
|||
PyObject* tag = PyTuple_GET_ITEM(yyvsp[0], 0);
|
||||
PyObject* attrs = PyTuple_GET_ITEM(yyvsp[0], 1);
|
||||
int error = 0;
|
||||
int cmp;
|
||||
char* fname;
|
||||
PyObject* tagname;
|
||||
if (tag==NULL || attrs==NULL) { error = 1; goto finish_start_end; }
|
||||
if (tag == NULL || attrs == NULL) { error = 1; goto finish_start_end; }
|
||||
tagname = PyUnicode_AsEncodedString(tag, "ascii", "ignore");
|
||||
if (tagname==NULL) { error=1; goto finish_start_end; }
|
||||
/* set encoding */
|
||||
result = PyObject_CallFunction(set_encoding, "OOO", ud->parser, tag, attrs);
|
||||
if (result==NULL) { error=1; goto finish_start_end; }
|
||||
Py_DECREF(result); result = NULL;
|
||||
if (tagname == NULL) { error = 1; goto finish_start_end; }
|
||||
cmp = PyObject_RichCompareBool(tag, u_meta, Py_EQ);
|
||||
if (cmp == -1) { error = 1; goto finish_start; }
|
||||
if (cmp == 1) {
|
||||
/* set encoding */
|
||||
result = PyObject_CallFunction(set_encoding, "OO", ud->parser, attrs);
|
||||
if (result == NULL) { error = 1; goto finish_start_end; }
|
||||
Py_CLEAR(result);
|
||||
}
|
||||
if (html_end_tag(tagname, ud->parser))
|
||||
fname = "start_end_element";
|
||||
else
|
||||
fname = "start_element";
|
||||
if (PyObject_HasAttrString(ud->handler, fname)==1) {
|
||||
if (PyObject_HasAttrString(ud->handler, fname) == 1) {
|
||||
callback = PyObject_GetAttrString(ud->handler, fname);
|
||||
if (!callback) { error=1; goto finish_start_end; }
|
||||
if (!callback) { error = 1; goto finish_start_end; }
|
||||
result = PyObject_CallFunction(callback, "OO", tag, attrs);
|
||||
if (!result) { error=1; goto finish_start_end; }
|
||||
Py_DECREF(callback);
|
||||
Py_DECREF(result);
|
||||
callback = result = NULL;
|
||||
if (!result) { error = 1; goto finish_start_end; }
|
||||
Py_CLEAR(callback);
|
||||
Py_CLEAR(result);
|
||||
}
|
||||
CHECK_ERROR(ud, finish_start_end);
|
||||
finish_start_end:
|
||||
|
|
@ -1256,7 +1265,7 @@ finish_start_end:
|
|||
break;
|
||||
|
||||
case 8:
|
||||
#line 268 "htmlparse.y"
|
||||
#line 277 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1265,16 +1274,15 @@ finish_start_end:
|
|||
int error = 0;
|
||||
/* encode tagname in ASCII, ignoring any unknown chars */
|
||||
PyObject* tagname = PyUnicode_AsEncodedString(yyvsp[0], "ascii", "ignore");
|
||||
if (tagname==NULL) { error=1; goto finish_end; }
|
||||
if (PyObject_HasAttrString(ud->handler, "end_element")==1 &&
|
||||
if (tagname == NULL) { error = 1; goto finish_end; }
|
||||
if (PyObject_HasAttrString(ud->handler, "end_element") == 1 &&
|
||||
html_end_tag(tagname, ud->parser)) {
|
||||
callback = PyObject_GetAttrString(ud->handler, "end_element");
|
||||
if (callback==NULL) { error=1; goto finish_end; }
|
||||
if (callback == NULL) { error = 1; goto finish_end; }
|
||||
result = PyObject_CallFunction(callback, "O", yyvsp[0]);
|
||||
if (result==NULL) { error=1; goto finish_end; }
|
||||
Py_DECREF(callback);
|
||||
Py_DECREF(result);
|
||||
callback = result = NULL;
|
||||
if (result == NULL) { error = 1; goto finish_end; }
|
||||
Py_CLEAR(callback);
|
||||
Py_CLEAR(result);
|
||||
}
|
||||
CHECK_ERROR(ud, finish_end);
|
||||
finish_end:
|
||||
|
|
@ -1293,7 +1301,7 @@ finish_end:
|
|||
break;
|
||||
|
||||
case 9:
|
||||
#line 302 "htmlparse.y"
|
||||
#line 310 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1317,7 +1325,7 @@ finish_comment:
|
|||
break;
|
||||
|
||||
case 10:
|
||||
#line 323 "htmlparse.y"
|
||||
#line 331 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1341,7 +1349,7 @@ finish_pi:
|
|||
break;
|
||||
|
||||
case 11:
|
||||
#line 344 "htmlparse.y"
|
||||
#line 352 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1365,7 +1373,7 @@ finish_cdata:
|
|||
break;
|
||||
|
||||
case 12:
|
||||
#line 365 "htmlparse.y"
|
||||
#line 373 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1374,8 +1382,8 @@ finish_cdata:
|
|||
int error = 0;
|
||||
/* set encoding */
|
||||
result = PyObject_CallFunction(set_doctype, "OO", ud->parser, yyvsp[0]);
|
||||
if (result==NULL) { error=1; goto finish_doctype; }
|
||||
Py_DECREF(result); result = NULL;
|
||||
if (result == NULL) { error = 1; goto finish_doctype; }
|
||||
Py_CLEAR(result);
|
||||
CALLBACK(ud, "doctype", "O", yyvsp[0], finish_doctype);
|
||||
CHECK_ERROR(ud, finish_doctype);
|
||||
finish_doctype:
|
||||
|
|
@ -1393,7 +1401,7 @@ finish_doctype:
|
|||
break;
|
||||
|
||||
case 13:
|
||||
#line 390 "htmlparse.y"
|
||||
#line 398 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1401,7 +1409,7 @@ finish_doctype:
|
|||
PyObject* result = NULL;
|
||||
int error = 0;
|
||||
PyObject* script = PyUnicode_DecodeASCII("script", 6, "ignore");
|
||||
if (script==NULL) { error=1; goto finish_script; }
|
||||
if (script == NULL) { error = 1; goto finish_script; }
|
||||
CALLBACK(ud, "characters", "O", yyvsp[0], finish_script);
|
||||
CALLBACK(ud, "end_element", "O", script, finish_script);
|
||||
CHECK_ERROR(ud, finish_script);
|
||||
|
|
@ -1421,7 +1429,7 @@ finish_script:
|
|||
break;
|
||||
|
||||
case 14:
|
||||
#line 415 "htmlparse.y"
|
||||
#line 423 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
UserData* ud = yyget_extra(scanner);
|
||||
|
|
@ -1429,7 +1437,7 @@ finish_script:
|
|||
PyObject* result = NULL;
|
||||
int error = 0;
|
||||
PyObject* style = PyUnicode_DecodeASCII("style", 5, "ignore");
|
||||
if (style==NULL) { error=1; goto finish_style; }
|
||||
if (style == NULL) { error = 1; goto finish_style; }
|
||||
CALLBACK(ud, "characters", "O", yyvsp[0], finish_style);
|
||||
CALLBACK(ud, "end_element", "O", style, finish_style);
|
||||
CHECK_ERROR(ud, finish_style);
|
||||
|
|
@ -1449,7 +1457,7 @@ finish_style:
|
|||
break;
|
||||
|
||||
case 15:
|
||||
#line 440 "htmlparse.y"
|
||||
#line 448 "htmlparse.y"
|
||||
{
|
||||
/* $1 is a PyUnicode */
|
||||
/* Remember this is also called as a lexer error fallback */
|
||||
|
|
@ -1477,7 +1485,7 @@ finish_characters:
|
|||
}
|
||||
|
||||
/* Line 1010 of yacc.c. */
|
||||
#line 1481 "htmlparse.c"
|
||||
#line 1489 "htmlparse.c"
|
||||
|
||||
yyvsp -= yylen;
|
||||
yyssp -= yylen;
|
||||
|
|
@ -1702,7 +1710,7 @@ yyreturn:
|
|||
}
|
||||
|
||||
|
||||
#line 463 "htmlparse.y"
|
||||
#line 471 "htmlparse.y"
|
||||
|
||||
|
||||
/* create parser object */
|
||||
|
|
@ -1772,7 +1780,7 @@ static int parser_init (parser_object* self, PyObject* args, PyObject* kwds) {
|
|||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O", kwlist, &handler)) {
|
||||
return -1;
|
||||
}
|
||||
if (handler==NULL) {
|
||||
if (handler == NULL) {
|
||||
return 0;
|
||||
}
|
||||
Py_DECREF(self->handler);
|
||||
|
|
@ -1876,18 +1884,18 @@ static PyObject* parser_flush (parser_object* self, PyObject* args) {
|
|||
PyObject* result = NULL;
|
||||
/* reset buffer */
|
||||
CLEAR_BUF(self->userData->buf);
|
||||
if (s==NULL) { error=1; goto finish_flush; }
|
||||
if (PyObject_HasAttrString(self->handler, "characters")==1) {
|
||||
if (s == NULL) { error = 1; goto finish_flush; }
|
||||
if (PyObject_HasAttrString(self->handler, "characters") == 1) {
|
||||
callback = PyObject_GetAttrString(self->handler, "characters");
|
||||
if (callback==NULL) { error=1; goto finish_flush; }
|
||||
if (callback == NULL) { error = 1; goto finish_flush; }
|
||||
result = PyObject_CallFunction(callback, "O", s);
|
||||
if (result==NULL) { error=1; goto finish_flush; }
|
||||
if (result == NULL) { error = 1; goto finish_flush; }
|
||||
}
|
||||
finish_flush:
|
||||
Py_XDECREF(callback);
|
||||
Py_XDECREF(result);
|
||||
Py_XDECREF(s);
|
||||
if (error==1) {
|
||||
if (error == 1) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
|
@ -2176,37 +2184,40 @@ PyMODINIT_FUNC inithtmlsax (void) {
|
|||
if (PyType_Ready(&parser_type) < 0) {
|
||||
return;
|
||||
}
|
||||
if ((m = Py_InitModule3("htmlsax", htmlsax_methods, "SAX HTML parser routines"))==NULL) {
|
||||
if ((m = Py_InitModule3("htmlsax", htmlsax_methods, "SAX HTML parser routines")) == NULL) {
|
||||
return;
|
||||
}
|
||||
Py_INCREF(&parser_type);
|
||||
if (PyModule_AddObject(m, "parser", (PyObject *)&parser_type)==-1) {
|
||||
if (PyModule_AddObject(m, "parser", (PyObject *)&parser_type) == -1) {
|
||||
/* init error */
|
||||
PyErr_Print();
|
||||
}
|
||||
if ((m = PyImport_ImportModule("linkcheck.HtmlParser"))==NULL) {
|
||||
if ((m = PyImport_ImportModule("linkcheck.HtmlParser")) == NULL) {
|
||||
return;
|
||||
}
|
||||
if ((resolve_entities = PyObject_GetAttrString(m, "resolve_entities"))==NULL) {
|
||||
if ((resolve_entities = PyObject_GetAttrString(m, "resolve_entities")) == NULL) {
|
||||
Py_DECREF(m);
|
||||
return;
|
||||
}
|
||||
if ((set_encoding = PyObject_GetAttrString(m, "set_encoding"))==NULL) {
|
||||
if ((set_encoding = PyObject_GetAttrString(m, "set_encoding")) == NULL) {
|
||||
Py_DECREF(resolve_entities);
|
||||
Py_DECREF(m);
|
||||
return;
|
||||
}
|
||||
if ((set_doctype = PyObject_GetAttrString(m, "set_doctype"))==NULL) {
|
||||
if ((set_doctype = PyObject_GetAttrString(m, "set_doctype")) == NULL) {
|
||||
Py_DECREF(resolve_entities);
|
||||
Py_DECREF(set_encoding);
|
||||
Py_DECREF(m);
|
||||
return;
|
||||
}
|
||||
Py_DECREF(m);
|
||||
if ((m = PyImport_ImportModule("linkcheck.containers"))==NULL) {
|
||||
if ((u_meta = PyString_Decode("meta", 4, "ascii", "ignore")) == NULL) {
|
||||
return;
|
||||
}
|
||||
if ((list_dict = PyObject_GetAttrString(m, "ListDict"))==NULL) {
|
||||
if ((m = PyImport_ImportModule("linkcheck.containers")) == NULL) {
|
||||
return;
|
||||
}
|
||||
if ((list_dict = PyObject_GetAttrString(m, "ListDict")) == NULL) {
|
||||
Py_DECREF(m);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue