From 99834ab3ec82b66a2b4f443ab60641978a2dd21b Mon Sep 17 00:00:00 2001 From: Metallicow Date: Tue, 16 Jan 2018 09:37:04 -0600 Subject: [PATCH] :interrobang: Trim trailing whitespace misc files All these files seem like legit trailing whitespace that can be removed. --- .travis.yml | 4 +- MANIFEST.in | 4 +- demo/data/imagemap.htm | 4 +- demo/data/proclamation.txt | 144 +++++++++--------- demo/data/tips.txt | 2 +- docs/sphinx/_static/css/phoenix.css | 62 ++++---- .../_static/javascript/jquery.collapse.js | 26 ++-- .../_static/javascript/toggle_visibility.js | 10 +- docs/sphinx/_templates/layout.html | 2 +- ext/README.txt | 2 +- packaging/README-bdist.txt | 2 +- packaging/cairo-msw/include/cairo/cairo.h | 2 +- sip/siplib/README.txt | 2 +- sip/siplib/siplib.c | 34 ++--- unittests/helpfiles/another.htm | 2 +- wx/lib/editor/README.txt | 4 +- wx/lib/myole4ax.idl | 12 +- wx/lib/pdfviewer/bitmaps/ReadMe.txt | 28 ++-- wx/lib/pubsub/LICENSE_BSD_Simple.txt | 6 +- wx/lib/pubsub/README.txt | 2 +- wx/lib/pubsub/README_WxPython.txt | 4 +- wx/lib/pubsub/RELEASE_NOTES.txt | 44 +++--- wx/lib/pubsub/examples/advanced/README.txt | 2 +- wx/lib/pubsub/examples/runall.bat | 4 +- wx/py/CHANGES.txt | 6 +- 25 files changed, 207 insertions(+), 207 deletions(-) diff --git a/.travis.yml b/.travis.yml index 051aa567..21c5510a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ # language: python - + matrix: include: - os: linux @@ -40,7 +40,7 @@ matrix: # redundant specification of `sudo` and `python` because of travis-ci.org's way of parsing `.travis.yml` - + # Available build steps: # 1. before_install # 2. install diff --git a/MANIFEST.in b/MANIFEST.in index 7c5cad2c..e5f14b44 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ # -# Although we don't use this template to make source distributions, it is -# still an easy way to specify what data files (non *.py files) should be +# Although we don't use this template to make source distributions, it is +# still an easy way to specify what data files (non *.py files) should be # included in the package dirs. # # See cmd_sdist() in build.py for the actual building of the source dist. diff --git a/demo/data/imagemap.htm b/demo/data/imagemap.htm index edebd33b..6dd62ca2 100644 --- a/demo/data/imagemap.htm +++ b/demo/data/imagemap.htm @@ -6,7 +6,7 @@ This is test. - + @@ -14,7 +14,7 @@ This is test. - + diff --git a/demo/data/proclamation.txt b/demo/data/proclamation.txt index 5d305e49..1723e23e 100644 --- a/demo/data/proclamation.txt +++ b/demo/data/proclamation.txt @@ -2,106 +2,106 @@ EMANCIPATION PROCLAMATION: By the President of the United States of America: A PROCLAMATION - Whereas on the 22nd day of September, A.D. 1862, a proclamation -was issued by the President of the United States, containing, + Whereas on the 22nd day of September, A.D. 1862, a proclamation +was issued by the President of the United States, containing, among other things, the following, to wit: - "That on the 1st day of January, A.D. 1863, all persons held as -slaves within any State or designated part of a State the people -whereof shall then be in rebellion against the United States shall -be then, thenceforward, and forever free; and the executive -government of the United States, including the military and naval -authority thereof, will recognize and maintain the freedom of such -persons and will do no act or acts to repress such persons, or any + "That on the 1st day of January, A.D. 1863, all persons held as +slaves within any State or designated part of a State the people +whereof shall then be in rebellion against the United States shall +be then, thenceforward, and forever free; and the executive +government of the United States, including the military and naval +authority thereof, will recognize and maintain the freedom of such +persons and will do no act or acts to repress such persons, or any of them, in any efforts they may make for their actual freedom. - "That the executive will on the 1st day of January aforesaid, -by proclamation, designate the States and parts of States, if any, -in which the people thereof, respectively, shall then be in -rebellion against the United States; and the fact that any State -or the people thereof shall on that day be in good faith -represented in the Congress of the United States by members -chosen thereto at elections wherein a majority of the qualified -voters of such States shall have participated shall, in the -absence of strong countervailing testimony, be deemed conclusive -evidence that such State and the people thereof are not then + "That the executive will on the 1st day of January aforesaid, +by proclamation, designate the States and parts of States, if any, +in which the people thereof, respectively, shall then be in +rebellion against the United States; and the fact that any State +or the people thereof shall on that day be in good faith +represented in the Congress of the United States by members +chosen thereto at elections wherein a majority of the qualified +voters of such States shall have participated shall, in the +absence of strong countervailing testimony, be deemed conclusive +evidence that such State and the people thereof are not then in rebellion against the United States." - Now, therefore, I, Abraham Lincoln, President of the United -States, by virtue of the power in me vested as Commander-In-Chief -of the Army and Navy of the United States in time of actual armed -rebellion against the authority and government of the United States, -and as a fit and necessary war measure for supressing said -rebellion, do, on this 1st day of January, A.D. 1863, and in -accordance with my purpose so to do, publicly proclaimed for the -full period of one hundred days from the first day above mentioned, -order and designate as the States and parts of States wherein the -people thereof, respectively, are this day in rebellion against + Now, therefore, I, Abraham Lincoln, President of the United +States, by virtue of the power in me vested as Commander-In-Chief +of the Army and Navy of the United States in time of actual armed +rebellion against the authority and government of the United States, +and as a fit and necessary war measure for supressing said +rebellion, do, on this 1st day of January, A.D. 1863, and in +accordance with my purpose so to do, publicly proclaimed for the +full period of one hundred days from the first day above mentioned, +order and designate as the States and parts of States wherein the +people thereof, respectively, are this day in rebellion against the United States the following, to wit: - Arkansas, Texas, Louisiana (except the parishes of St. Bernard, -Palquemines, Jefferson, St. John, St. Charles, St. James, Ascension, -Assumption, Terrebone, Lafourche, St. Mary, St. Martin, and Orleans, -including the city of New Orleans), Mississippi, Alabama, Florida, -Georgia, South Carolina, North Carolina, and Virginia (except the -forty-eight counties designated as West Virginia, and also the -counties of Berkeley, Accomac, Morthhampton, Elizabeth City, York, -Princess Anne, and Norfolk, including the cities of Norfolk and -Portsmouth), and which excepted parts are for the present left + Arkansas, Texas, Louisiana (except the parishes of St. Bernard, +Palquemines, Jefferson, St. John, St. Charles, St. James, Ascension, +Assumption, Terrebone, Lafourche, St. Mary, St. Martin, and Orleans, +including the city of New Orleans), Mississippi, Alabama, Florida, +Georgia, South Carolina, North Carolina, and Virginia (except the +forty-eight counties designated as West Virginia, and also the +counties of Berkeley, Accomac, Morthhampton, Elizabeth City, York, +Princess Anne, and Norfolk, including the cities of Norfolk and +Portsmouth), and which excepted parts are for the present left precisely as if this proclamation were not issued. - And by virtue of the power and for the purpose aforesaid, I do -order and declare that all persons held as slaves within said -designated States and parts of States are, and henceforward shall -be, free; and that the Executive Government of the United States, -including the military and naval authorities thereof, will + And by virtue of the power and for the purpose aforesaid, I do +order and declare that all persons held as slaves within said +designated States and parts of States are, and henceforward shall +be, free; and that the Executive Government of the United States, +including the military and naval authorities thereof, will recognize and maintain the freedom of said persons. - And I hereby enjoin upon the people so declared to be free to -abstain from all violence, unless in necessary self-defence; and -I recommend to them that, in all case when allowed, they labor + And I hereby enjoin upon the people so declared to be free to +abstain from all violence, unless in necessary self-defence; and +I recommend to them that, in all case when allowed, they labor faithfully for reasonable wages. - And I further declare and make known that such persons of -suitable condition will be received into the armed service of -the United States to garrison forts, positions, stations, and + And I further declare and make known that such persons of +suitable condition will be received into the armed service of +the United States to garrison forts, positions, stations, and other places, and to man vessels of all sorts in said service. - And upon this act, sincerely believed to be an act of justice, -warranted by the Constitution upon military necessity, I invoke -the considerate judgment of mankind and the gracious favor + And upon this act, sincerely believed to be an act of justice, +warranted by the Constitution upon military necessity, I invoke +the considerate judgment of mankind and the gracious favor of Almighty God. (signed) ABRAHAM LINCOLN ------------------------------------- -On Jan. 1, 1863, U.S. President Abraham Lincoln declared free -all slaves residing in territory in rebellion against the federal -government. This Emancipation Proclamation actually freed few -people. It did not apply to slaves in border states fighting on -the Union side; nor did it affect slaves in southern areas already -under Union control. Naturally, the states in rebellion did not +On Jan. 1, 1863, U.S. President Abraham Lincoln declared free +all slaves residing in territory in rebellion against the federal +government. This Emancipation Proclamation actually freed few +people. It did not apply to slaves in border states fighting on +the Union side; nor did it affect slaves in southern areas already +under Union control. Naturally, the states in rebellion did not act on Lincoln's order. But the proclamation did show Americans-- and the world--that the civil war was now being fought to end slavery. -Lincoln had been reluctant to come to this position. A believer -in white supremacy, he initially viewed the war only in terms of -preserving the Union. As pressure for abolition mounted in -Congress and the country, however, Lincoln became more sympathetic -to the idea. On Sept. 22, 1862, he issued a preliminary proclamation -announcing that emancipation would become effective on Jan. 1, 1863, -in those states still in rebellion. Although the Emancipation -Proclamation did not end slavery in America--this was achieved -by the passage of the 13TH Amendment to the Constitution on Dec. -18, 1865--it did make that accomplishment a basic war goal and -a virtual certainty. +Lincoln had been reluctant to come to this position. A believer +in white supremacy, he initially viewed the war only in terms of +preserving the Union. As pressure for abolition mounted in +Congress and the country, however, Lincoln became more sympathetic +to the idea. On Sept. 22, 1862, he issued a preliminary proclamation +announcing that emancipation would become effective on Jan. 1, 1863, +in those states still in rebellion. Although the Emancipation +Proclamation did not end slavery in America--this was achieved +by the passage of the 13TH Amendment to the Constitution on Dec. +18, 1865--it did make that accomplishment a basic war goal and +a virtual certainty. DOUGLAS T. MILLER -Bibliography: Commager, Henry Steele, The Great Proclamation -(1960); Donovan, Frank, Mr. Lincoln's Proclamation (1964); -Franklin, John Hope, ed., The Emancipation Proclamation (1964). +Bibliography: Commager, Henry Steele, The Great Proclamation +(1960); Donovan, Frank, Mr. Lincoln's Proclamation (1964); +Franklin, John Hope, ed., The Emancipation Proclamation (1964). ------------------------------------- diff --git a/demo/data/tips.txt b/demo/data/tips.txt index 669f4a9b..3433e83a 100644 --- a/demo/data/tips.txt +++ b/demo/data/tips.txt @@ -56,7 +56,7 @@ Your ignorance cramps my conversation. The brain is a wonderful organ; it starts working the moment you get up in the morning and does not stop until you get into the office. -- Robert Frost By working faithfully eight hours a day, you may get to be a boss and work twelve hours a day. -- Robert Frost In three words I can sum up everything I've learned about life: it goes on. -- Robert Frost -If we get involved in a nuclear war, would the electromagnetic pulses from exploding bombs damage my videotapes? +If we get involved in a nuclear war, would the electromagnetic pulses from exploding bombs damage my videotapes? The earth? Oh the earth will be gone in a few seconds...I'm going to blow it up. It's obstructing my view of Venus. -- Marvin the Martian There's that word again, 'heavy'. Why are things so heavy in the future? Is there a problem with the earth's gravitational pull? -- Dr Emmet Brown, "Back To The Future" I'm Luke Skywalker, I'm here to rescue you. diff --git a/docs/sphinx/_static/css/phoenix.css b/docs/sphinx/_static/css/phoenix.css index 0086a0f6..eab1e03e 100644 --- a/docs/sphinx/_static/css/phoenix.css +++ b/docs/sphinx/_static/css/phoenix.css @@ -16,7 +16,7 @@ div.body p, div.body dd, div.body li { text-align: left; } -ul.simple { +ul.simple { margin-top: 0; margin-bottom: 0; padding-top: 0; @@ -50,22 +50,22 @@ div.quotebar { } /** - * Hide dummy toctrees + * Hide dummy toctrees */ -ul { +ul { padding-top: 0; padding-bottom: 0; margin-top: 0; margin-bottom: 0; } -ul li { +ul li { padding-top: 0; padding-bottom: 0; margin-top: 0; margin-bottom: 0; } -ul li a.reference { +ul li a.reference { padding-top: 0; padding-bottom: 0; margin-top: 0; @@ -75,20 +75,20 @@ ul li a.reference { /** * Make high-level subsections easier to distinguish from top-level ones */ -div.body h3 { +div.body h3 { background-color: transparent; } -div.body h4 { +div.body h4 { border: none; background-color: transparent; } -/** +/** * Scipy colors */ -body { +body { background-color: rgb(230,230,230); font-size: 0.90em; } @@ -101,7 +101,7 @@ div.headerimage-noshow { display:none; } -div.document { +div.document { background-color: rgb(230,230,230); position: relative; margin-left: 240px; @@ -121,7 +121,7 @@ div.sphinxsidebar { z-index: 1; left: 0; top: 30px; - bottom: 0; + bottom: 0; } div#searchbox { @@ -129,7 +129,7 @@ div#searchbox { } div#sourcelink { - position: absolute; + position: absolute; bottom: 0; font-style: italic; font-size: small; @@ -249,7 +249,7 @@ div.footer { float:left; text-align:center; } - + .floatcenter { position:relative; float:none; @@ -272,8 +272,8 @@ div.headerfix :target { margin-top: -{{ 30 }}; } -/** - * Extra admonitions +/** + * Extra admonitions */ div.return { @@ -290,18 +290,18 @@ div.availability { border: 1px solid #adff2f; } -div.plot-output { +div.plot-output { clear-after: both; } -div.plot-output .figure { +div.plot-output .figure { float: center; text-align: center; margin-bottom: 0; padding-bottom: 0; } -div.plot-output .caption { +div.plot-output .caption { margin-top: 2; padding-top: 0; } @@ -310,11 +310,11 @@ div.plot-output p.admonition-title { display: none; } -div.plot-output:after { - content: ""; - display: block; - height: 0; - clear: both; +div.plot-output:after { + content: ""; + display: block; + height: 0; + clear: both; } .doctodo { @@ -369,7 +369,7 @@ div.admonition { text-align: left; background-image: url('../images/sphinxdocs/todo.png'); background-repeat: no-repeat; - background-position: 5px 5px; + background-position: 5px 5px; padding-left: 33px; } @@ -383,7 +383,7 @@ div.seealso { text-align: left; background-image: url('../images/sphinxdocs/seealso.png'); background-repeat: no-repeat; - background-position: 5px 5px; + background-position: 5px 5px; padding-left: 33px; } @@ -397,7 +397,7 @@ div.warning { text-align: left; background-image: url('../images/sphinxdocs/warning.png'); background-repeat: no-repeat; - background-position: 5px 5px; + background-position: 5px 5px; padding-left: 33px; } @@ -411,7 +411,7 @@ div.todo { text-align: left; background-image: url('../images/sphinxdocs/todo.png'); background-repeat: no-repeat; - background-position: 5px 5px; + background-position: 5px 5px; padding-left: 33px; } @@ -456,7 +456,7 @@ div.note { text-align: left; background-image: url('../images/sphinxdocs/info.png'); background-repeat: no-repeat; - background-position: 5px 5px; + background-position: 5px 5px; padding-left: 33px; } @@ -470,7 +470,7 @@ div.availability { text-align: left; background-image: url('../images/sphinxdocs/available.png'); background-repeat: no-repeat; - background-position: 5px 5px; + background-position: 5px 5px; padding-left: 33px; } @@ -502,12 +502,12 @@ table.field-list th { padding-left: 5px; } -table.field-list { +table.field-list { border-collapse: separate; border-spacing: 10px; } -/** +/** * Styling for footnotes */ diff --git a/docs/sphinx/_static/javascript/jquery.collapse.js b/docs/sphinx/_static/javascript/jquery.collapse.js index c0776d12..96b13a2e 100644 --- a/docs/sphinx/_static/javascript/jquery.collapse.js +++ b/docs/sphinx/_static/javascript/jquery.collapse.js @@ -5,40 +5,40 @@ * @author Daniel Stocks (http://webcloud.se) * @version 0.9.1 * @updated 17-AUG-2010 - * + * * Copyright 2010, Daniel Stocks * Released under the MIT, BSD, and GPL Licenses. */ - + (function($) { - + // Use a cookie counter to allow multiple instances of the plugin var cookieCounter = 0; - + $.fn.extend({ collapse: function(options) { - + var defaults = { head : "h3", group : "div, ul", cookieName : "collapse", // Default function for showing content - show: function() { + show: function() { this.show(); }, // Default function for hiding content - hide: function() { + hide: function() { this.hide(); } }; var op = $.extend(defaults, options); - + // Default CSS classes var active = "myactive", inactive = "myinactive"; - + return this.each(function() { - + // Increment coookie counter to ensure cookie name integrity cookieCounter++; var obj = $(this), @@ -54,7 +54,7 @@ } return head.next(op.group)[0]; }); - + // Bind event for showing content obj.bind("show", function(e, bypass) { var obj = $(e.target); @@ -84,7 +84,7 @@ op.hide.call(obj); } }); - + // Look for existing cookies if(cookieSupport) { for (var c=0;c<=l;c++) { @@ -98,7 +98,7 @@ } } } - + // Delegate click event to show/hide content. obj.bind("click", function(e) { var t = $(e.target); diff --git a/docs/sphinx/_static/javascript/toggle_visibility.js b/docs/sphinx/_static/javascript/toggle_visibility.js index b3ee2aae..9b5c2b80 100644 --- a/docs/sphinx/_static/javascript/toggle_visibility.js +++ b/docs/sphinx/_static/javascript/toggle_visibility.js @@ -2,13 +2,13 @@ * toggle_visibility.js * -------------------- * - * These functions enable the user to toggle the visibility of a block of + * These functions enable the user to toggle the visibility of a block of * the document, which is delimited by a
tag with an expected id - * attribute. The magic happens via using the id of the object passed to - * toggle visibility to make the id's used to find the other elements that - * will be operated upon. + * attribute. The magic happens via using the id of the object passed to + * toggle visibility to make the id's used to find the other elements that + * will be operated upon. */ - + function hasClass(ele,cls) { return ele.className.match(new RegExp('(\\s|^)'+cls+'(\\s|$)')); } diff --git a/docs/sphinx/_templates/layout.html b/docs/sphinx/_templates/layout.html index 76db1973..7605dc6c 100644 --- a/docs/sphinx/_templates/layout.html +++ b/docs/sphinx/_templates/layout.html @@ -60,7 +60,7 @@
Phoenix Logo
- + {% block body %} {% endblock %} {%- if theme_disqus_comments|tobool %}
diff --git a/ext/README.txt b/ext/README.txt index 70054ba6..fb37a1e4 100644 --- a/ext/README.txt +++ b/ext/README.txt @@ -18,7 +18,7 @@ To learn more about git submodules, please see the following: http://git-scm.com/book/en/v2/Git-Tools-Submodules http://blogs.atlassian.com/2013/03/git-submodules-workflows-tips/ http://www.speirs.org/blog/2009/5/11/understanding-git-submodules.html - + Notes to self ============= diff --git a/packaging/README-bdist.txt b/packaging/README-bdist.txt index 8b202c67..67efe49b 100644 --- a/packaging/README-bdist.txt +++ b/packaging/README-bdist.txt @@ -42,7 +42,7 @@ The Phoenix extension modules need to load the dynamic libraries that contain the wxWidgets code for the platform. In most cases the extension modules in this snapshot already know to look in the same folder for the wxWidgets shared libraries. This will work for Windows and Mac, and should also work -for any unix-like system based on ELF binaries, and if the expected objdump +for any unix-like system based on ELF binaries, and if the expected objdump utility was found on the build system. For those cases where the build was not able to perform the neccesary magic diff --git a/packaging/cairo-msw/include/cairo/cairo.h b/packaging/cairo-msw/include/cairo/cairo.h index 136c5dbf..efe3112b 100644 --- a/packaging/cairo-msw/include/cairo/cairo.h +++ b/packaging/cairo-msw/include/cairo/cairo.h @@ -868,7 +868,7 @@ typedef struct _cairo_rectangle { * @status: Error status of the rectangle list * @rectangles: Array containing the rectangles * @num_rectangles: Number of rectangles in this list - * + * * A data structure for holding a dynamically allocated * array of rectangles. * diff --git a/sip/siplib/README.txt b/sip/siplib/README.txt index 3af64a87..b745de83 100644 --- a/sip/siplib/README.txt +++ b/sip/siplib/README.txt @@ -1,7 +1,7 @@ This folder contains a copy of the SIP runtime library code. It is here so we can make it part of the wxPython build instead of needing to have a dependency upon SIP already being installed on user -machines. +machines. 3rd party extension modules that need to use or interact with wxPython types or other items will need to ensure that they #include the sip.h diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c index a309761a..eb1797ab 100644 --- a/sip/siplib/siplib.c +++ b/sip/siplib/siplib.c @@ -4579,7 +4579,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, case 'F': { /* Python callable object. */ - + PyObject **p = va_arg(va, PyObject **); if (arg != NULL) @@ -4595,14 +4595,14 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, Py_INCREF(arg); } } - + break; } case 'H': { /* Python callable object or None. */ - + PyObject **p = va_arg(va, PyObject **); if (arg != NULL) @@ -4618,14 +4618,14 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, Py_INCREF(arg); } } - + break; } case '!': { /* Python object that implements the buffer protocol. */ - + PyObject **p = va_arg(va, PyObject **); if (arg != NULL) @@ -4647,7 +4647,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, Py_INCREF(arg); } } - + break; } @@ -4656,7 +4656,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, /* * Python object that implements the buffer protocol or None. */ - + PyObject **p = va_arg(va, PyObject **); if (arg != NULL) @@ -4678,7 +4678,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, Py_INCREF(arg); } } - + break; } @@ -7124,7 +7124,7 @@ static int isNonlazyMethod(PyMethodDef *pmd) "__aexit__", #endif NULL - }; + }; const char **l; @@ -9659,11 +9659,11 @@ void sipSaveMethod(sipPyMethod *pm, PyObject *meth) static void sip_api_call_hook(const char *hookname) { PyObject *dictofmods, *mod, *dict, *hook, *res; - + /* Get the dictionary of modules. */ if ((dictofmods = PyImport_GetModuleDict()) == NULL) return; - + #if PY_MAJOR_VERSION >= 3 /* Get the builtins module. */ if ((mod = PyDict_GetItemString(dictofmods, "builtins")) == NULL) @@ -9673,18 +9673,18 @@ static void sip_api_call_hook(const char *hookname) if ((mod = PyDict_GetItemString(dictofmods, "__builtin__")) == NULL) return; #endif - + /* Get it's dictionary. */ if ((dict = PyModule_GetDict(mod)) == NULL) return; - + /* Get the function hook. */ if ((hook = PyDict_GetItemString(dict, hookname)) == NULL) return; - + /* Call the hook and discard any result. */ res = PyObject_Call(hook, empty_tuple, NULL); - + Py_XDECREF(res); } @@ -10522,7 +10522,7 @@ static int sipSimpleWrapper_init(sipSimpleWrapper *self, PyObject *args, */ new_unused_p = &new_unused; } - + if (final_func((PyObject *)self, sipNew, unused, new_unused_p) < 0) { Py_XDECREF(unused); @@ -11315,7 +11315,7 @@ static int sipSimpleWrapper_set_dict(sipSimpleWrapper *sw, PyObject *value, } Py_XDECREF(sw->dict); - + Py_XINCREF(value); sw->dict = value; diff --git a/unittests/helpfiles/another.htm b/unittests/helpfiles/another.htm index 4532dc8c..77e97df3 100644 --- a/unittests/helpfiles/another.htm +++ b/unittests/helpfiles/another.htm @@ -14,7 +14,7 @@ a contents (.hhc) file. You must always supply a contents file because Wanna know what a contents file looks like? Click here diff --git a/wx/lib/editor/README.txt b/wx/lib/editor/README.txt index 6bf61637..107af2d6 100644 --- a/wx/lib/editor/README.txt +++ b/wx/lib/editor/README.txt @@ -3,7 +3,7 @@ wxEditor component The wxEditor class implements a simple text editor using wxPython. You can create a custom editor by subclassing wxEditor. Even though much of -the editor is implemented in Python, it runs surprisingly smoothly on +the editor is implemented in Python, it runs surprisingly smoothly on normal hardware with small files. @@ -16,7 +16,7 @@ Cursor movement: Arrow keys Beginning of line: Home End of line: End Beginning of buffer: Control-Home -End of the buffer: Control-End +End of the buffer: Control-End Select text: Hold down Shift while moving the cursor Copy: Shift-Insert, Control-C Cut: Shift-Delete, Control-X diff --git a/wx/lib/myole4ax.idl b/wx/lib/myole4ax.idl index 92adc063..6dce9470 100644 --- a/wx/lib/myole4ax.idl +++ b/wx/lib/myole4ax.idl @@ -5,10 +5,10 @@ helpstring("My Ole Guid and interface definitions"), lcid(0x0), version(1.0) - ] + ] library myole4ax -{ +{ importlib("stdole2.tlb"); interface IOleInPlaceUIWindow; @@ -60,7 +60,7 @@ library myole4ax LONG cAccelEntries; } OLEINPLACEFRAMEINFO; - + // [ // uuid(00000000-0000-0000-C000-000000000046), // odl, @@ -71,9 +71,9 @@ library myole4ax // long QueryInterface([in] long priid, [out,in] long* pvObj); // long AddRef(); // long Release(); -// }; +// }; + - [ uuid(00000114-0000-0000-C000-000000000046), odl @@ -127,7 +127,7 @@ library myole4ax long TranslateAccelerator([in] long lpmsg); long OnFrameWindowActivate([in] long fActivate); long OnDocWindowActivate([in] long fActivate); - long ResizeBorder([in] StructPtr prcBorder, + long ResizeBorder([in] StructPtr prcBorder, [in] IOleInPlaceUIWindow* pUIWindow, [in] long fFrameWindow); long EnableModeless([in] long fEnable); diff --git a/wx/lib/pdfviewer/bitmaps/ReadMe.txt b/wx/lib/pdfviewer/bitmaps/ReadMe.txt index e934d2da..2096108b 100644 --- a/wx/lib/pdfviewer/bitmaps/ReadMe.txt +++ b/wx/lib/pdfviewer/bitmaps/ReadMe.txt @@ -1,28 +1,28 @@ -Free Icons by Axialis Software -http://www.axialis.com +Free Icons by Axialis Software +http://www.axialis.com -Here is a library of icons that you can freely use in your projects. All -the icons are licensed under the Creative Commons Attribution License -(http://creativecommons.org/licenses/by/2.5/). It means that you can use -them in any project or website, commercially or not. +Here is a library of icons that you can freely use in your projects. All +the icons are licensed under the Creative Commons Attribution License +(http://creativecommons.org/licenses/by/2.5/). It means that you can use +them in any project or website, commercially or not. The icons have been created by Axialis IconWorkshop, the professional icon authoring tool for Windows. For more info visit this page: http://www.axialis.com/iconworkshop TERMS OF USE -The only restrictions are: (a) you must keep the credits of the authors: -"Axialis Team", even if you modify them; (b) link to us if you use them -on your website (see below). +The only restrictions are: (a) you must keep the credits of the authors: +"Axialis Team", even if you modify them; (b) link to us if you use them +on your website (see below). LINK TO US -If you use the icons in your website, you must add the following link on -EACH PAGE containing the icons (at the bottom of the page for example). +If you use the icons in your website, you must add the following link on +EACH PAGE containing the icons (at the bottom of the page for example). The HTML code for this link is: Icons by Axialis Team - - - + + + diff --git a/wx/lib/pubsub/LICENSE_BSD_Simple.txt b/wx/lib/pubsub/LICENSE_BSD_Simple.txt index 9a7ace03..7e2e402d 100644 --- a/wx/lib/pubsub/LICENSE_BSD_Simple.txt +++ b/wx/lib/pubsub/LICENSE_BSD_Simple.txt @@ -2,13 +2,13 @@ Copyright (c) since 2006, Oliver Schoenborn All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. + list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. + and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/wx/lib/pubsub/README.txt b/wx/lib/pubsub/README.txt index 99de95ff..0ad681a8 100644 --- a/wx/lib/pubsub/README.txt +++ b/wx/lib/pubsub/README.txt @@ -2,7 +2,7 @@ Release Notes ============= * cleanup low-level API: exception classes, moved some out of pub module that did not - belong there (clutter), move couple modules, + belong there (clutter), move couple modules, * completed the reference documentation * support installation via pip * follow some guidelines in some PEPs such as PEP 396 and PEP 8 diff --git a/wx/lib/pubsub/README_WxPython.txt b/wx/lib/pubsub/README_WxPython.txt index 8fcf8dd7..a96fe49b 100644 --- a/wx/lib/pubsub/README_WxPython.txt +++ b/wx/lib/pubsub/README_WxPython.txt @@ -1,9 +1,9 @@ # this file gets copied to wx/lib/pubsub folder when release to wxPython -For wxPython users: +For wxPython users: The code in this wx/lib/pubsub folder is taken verbatim from the PyPubSub -project on SourceForge.net. Pubsub originated as a wxPython lib, but it is now +project on SourceForge.net. Pubsub originated as a wxPython lib, but it is now a standalone project on SourceForge. It is included as part of wxPython distribution for convenience to wxPython users, but pubsub can also be installed standalone (see installation notes at http://pypubsub.sourceforge.net), or you diff --git a/wx/lib/pubsub/RELEASE_NOTES.txt b/wx/lib/pubsub/RELEASE_NOTES.txt index f2ec6c5a..d931911a 100644 --- a/wx/lib/pubsub/RELEASE_NOTES.txt +++ b/wx/lib/pubsub/RELEASE_NOTES.txt @@ -1,8 +1,8 @@ For PyPubSub v3.3.0 ^^^^^^^^^^^^^^^^^^^^^ -* cleanup low-level API: exception classes, moved some out of pub module that did not - belong there (clutter), move couple modules, +* cleanup low-level API: exception classes, moved some out of pub module that did not + belong there (clutter), move couple modules, * completed the reference documentation * support installation via pip * follow some guidelines in some PEPs such as PEP 396 and PEP 8 @@ -11,15 +11,15 @@ For PyPubSub v3.3.0 For PyPubSub v3.2.0 ^^^^^^^^^^^^^^^^^^^ -This is a minor release for small improvements made (see docs/CHANGELOG.txt) -based on feedback from user community. In particular an XML reader for -topic specification contributed by Josh English. Also cleaned up the +This is a minor release for small improvements made (see docs/CHANGELOG.txt) +based on feedback from user community. In particular an XML reader for +topic specification contributed by Josh English. Also cleaned up the documentation, updated the examples folder (available in source distribution -as well as `online`_). +as well as `online`_). .. _online: https://sourceforge.net/p/pubsub/code/HEAD/tree/ -Only 3 changes to API (function names): +Only 3 changes to API (function names): * renamed pub.getDefaultRootAllTopics to pub.getDefaultTopicTreeRoot * removed pub.importTopicTree: use pub.addTopicDefnProvider(source, format) @@ -32,10 +32,10 @@ September 2013 PyPubSub 3.1.2 ^^^^^^^^^^^^^^^^ -This is a minor release for small improvements made (see docs/CHANGELOG.txt) -based on feedback from user community. Also extended the documentation. See -pubsub.sourceforge.net for installation and usage. See the examples folder for -some useful examples. +This is a minor release for small improvements made (see docs/CHANGELOG.txt) +based on feedback from user community. Also extended the documentation. See +pubsub.sourceforge.net for installation and usage. See the examples folder for +some useful examples. Oliver Schoenborn Nov 2011 @@ -44,7 +44,7 @@ Nov 2011 PyPubSub 3.1.1b1 ^^^^^^^^^^^^^^^^^^ -Docs updated. +Docs updated. Oliver Schoenborn May 2010 @@ -53,19 +53,19 @@ May 2010 For PyPubSub v3.1.0b1 ^^^^^^^^^^^^^^^^^^^^^^ -Major cleanup of the API since 3.0 and better support -for the legacy wxPython code. Defining a topic tree +Major cleanup of the API since 3.0 and better support +for the legacy wxPython code. Defining a topic tree via a text file has been improved drastically, making it simpler to document topic messages and payload data -required or optional. More examples have been added, -and the messaging protocols clarified. +required or optional. More examples have been added, +and the messaging protocols clarified. -The included docs are not yet updated, that's what I'm -working on now and will lead to the 3.1.1b1 release. -I'm also working on an add-on module that would allow -two applications to communicate over the network using -pubsub-type messaging (with topics, etc). The design -is almost complete. +The included docs are not yet updated, that's what I'm +working on now and will lead to the 3.1.1b1 release. +I'm also working on an add-on module that would allow +two applications to communicate over the network using +pubsub-type messaging (with topics, etc). The design +is almost complete. Oliver Schoenborn Jan 2010 \ No newline at end of file diff --git a/wx/lib/pubsub/examples/advanced/README.txt b/wx/lib/pubsub/examples/advanced/README.txt index 1ef31654..77ae505a 100644 --- a/wx/lib/pubsub/examples/advanced/README.txt +++ b/wx/lib/pubsub/examples/advanced/README.txt @@ -3,7 +3,7 @@ examples uses the *kwargs* messaging protocol, the other uses the *arg1* messaging protocol. There are two examples that can be run from this folder: **main_kwargs.py**: advanced example that shows other capabilities of - pubsub such as pubsub notification and listener exception + pubsub such as pubsub notification and listener exception handling, in the 'kwargs' messaging protocol. All modules that start with 'kwargs\_' are used, as well as some modules that are independent of protocol and are shared with the arg1_main diff --git a/wx/lib/pubsub/examples/runall.bat b/wx/lib/pubsub/examples/runall.bat index 99dccf8c..0a34aa8d 100644 --- a/wx/lib/pubsub/examples/runall.bat +++ b/wx/lib/pubsub/examples/runall.bat @@ -4,7 +4,7 @@ rem This script runs all examples. This should be mostly for using the rem examples as regression tests (after all tests have passed in tests rem folder). rem One command line argument is required, the python version number to -rem use, no dots: 24 for 2.4, 30 for 3.0, etc. +rem use, no dots: 24 for 2.4, 30 for 3.0, etc. rem rem (C) Oliver Schoenborn 2009 @@ -12,7 +12,7 @@ set PY_VER=%1 IF "%1" EQU "" ( SET PY_VER=26 echo Will use Python 2.6. To use other, put version ID as command line arg - echo Example: for Python 2.7 put 27, for 3.0 put 30, etc. + echo Example: for Python 2.7 put 27, for 3.0 put 30, etc. ) set PYTHON_EXE=python diff --git a/wx/py/CHANGES.txt b/wx/py/CHANGES.txt index 501c091e..dc171e2d 100644 --- a/wx/py/CHANGES.txt +++ b/wx/py/CHANGES.txt @@ -15,7 +15,7 @@ Now (Finally): crustslices.py contains: CrustSlices and CrustSlicesFrame PyShell.py and PySlicesShell.py are the respective standalone shell apps PyCrust.py and PySlices.py are the respective apps that also include Filling - + frame.py etc. still continue to service both PyCrust and PySlices. 0.9.7.8 (9/8/09) @@ -43,7 +43,7 @@ After revising the naming conventions: crustslices.py contains: CrustSlices and CrustSlicesFrame PyShell.py and PySlicesShell.py are the respective standalone shell apps PyCrust.py and PySlices.py are the respective apps that also include Filling - + frame.py etc. still continue to service both PyCrust and PySlices. 0.9.7.7 (8/25/2009) (Current--Still Need to SVNAdd the new file PySlicesShell.py) @@ -160,7 +160,7 @@ On top of these changes I (Robin Dunn) added the following: file pointed to by PYTHONSTARTUP or a file in the config dir if PYTHONSTARTUP is not set in the environment. -* Added an option to skip the running of the startup code when +* Added an option to skip the running of the startup code when PyShell or PyCrust starts. * PyCrust adds a pp(item) function to the shell's namespace that