Branch: master

e35c7619 2014-10-10 09:04:26 Michele Calgaro
Updated python 2 and added python 3 TDevelop documentation toc files. This relates to bug 1859.
A languages/python/doc/python2.toc
A languages/python/doc/python3.toc
M languages/python/doc/CMakeLists.txt
M languages/python/doc/Makefile.am
R languages/python/doc/python.toc
diff --git a/languages/python/doc/CMakeLists.txt b/languages/python/doc/CMakeLists.txt
index a3caa5f..68289e5 100644
--- a/languages/python/doc/CMakeLists.txt
+++ b/languages/python/doc/CMakeLists.txt
@@ -10,5 +10,5 @@
 #################################################
 
 install( FILES
-    python.toc python_bugs.toc
+    python2.toc python3.toc python_bugs.toc
   DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
diff --git a/languages/python/doc/Makefile.am b/languages/python/doc/Makefile.am
index 5159f5f..4f11152 100644
--- a/languages/python/doc/Makefile.am
+++ b/languages/python/doc/Makefile.am
@@ -1,5 +1,5 @@
 tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = python.toc python_bugs.toc
+toc_DATA = python2.toc python3.toc python_bugs.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
 #index_DATA = python.index
diff --git a/languages/python/doc/python.toc b/languages/python/doc/python.toc
deleted file mode 100644
index a0352dc..0000000
--- a/languages/python/doc/python.toc
+++ /dev/null
@@ -1,1571 +0,0 @@
-<!DOCTYPE tdeveloptoc>
-<tdeveloptoc>
-<title>Python</title>
-<base href="http://docs.python.org"/>
-<tocsect1 name="Tutorial" url="tut/tut.html">
-<tocsect2 name="Front Matter" url="tut/node1.html"/>
-<tocsect2 name="Contents" url="tut/node2.html"/>
-<tocsect2 name="1. Whetting Your Appetite " url="tut/node3.html">
-<tocsect3 name="1.1 Where From Here " url="tut/node3.html#SECTION003100000000000000000"/>
-</tocsect2>
-<tocsect2 name="2. Using the Python Interpreter " url="tut/node4.html">
-<tocsect3 name="2.1 Invoking the Interpreter " url="tut/node4.html#SECTION004100000000000000000">
-<tocsect4 name="2.1.1 Argument Passing " url="tut/node4.html#SECTION004110000000000000000"/>
-<tocsect4 name="2.1.2 Interactive Mode " url="tut/node4.html#SECTION004120000000000000000"/>
-</tocsect3>
-<tocsect3 name="2.2 The Interpreter and Its Environment " url="tut/node4.html#SECTION004200000000000000000">
-<tocsect4 name="2.2.1 Error Handling " url="tut/node4.html#SECTION004210000000000000000"/>
-<tocsect4 name="2.2.2 Executable Python Scripts " url="tut/node4.html#SECTION004220000000000000000"/>
-<tocsect4 name="2.2.3 The Interactive Startup File " url="tut/node4.html#SECTION004230000000000000000"/>
-</tocsect3>
-</tocsect2>
-<tocsect2 name="3. An Informal Introduction to Python " url="tut/node5.html">
-<tocsect3 name="3.1 Using Python as a Calculator " url="tut/node5.html#SECTION005100000000000000000">
-<tocsect4 name="3.1.1 Numbers " url="tut/node5.html#SECTION005110000000000000000"/>
-<tocsect4 name="3.1.2 Strings " url="tut/node5.html#SECTION005120000000000000000"/>
-<tocsect4 name="3.1.3 Unicode Strings " url="tut/node5.html#SECTION005130000000000000000"/>
-<tocsect4 name="3.1.4 Lists " url="tut/node5.html#SECTION005140000000000000000"/>
-</tocsect3>
-<tocsect3 name="3.2 First Steps Towards Programming " url="tut/node5.html#SECTION005200000000000000000"/>
-</tocsect2>
-<tocsect2 name="4. More Control Flow Tools " url="tut/node6.html">
-<tocsect3 name="4.1 if Statements " url="tut/node6.html#SECTION006100000000000000000"/>
-<tocsect3 name="4.2 for Statements " url="tut/node6.html#SECTION006200000000000000000"/>
-<tocsect3 name="4.3 The range() Function " url="tut/node6.html#SECTION006300000000000000000"/>
-<tocsect3 name="4.5 pass Statements " url="tut/node6.html#SECTION006500000000000000000"/>
-<tocsect3 name="4.6 Defining Functions " url="tut/node6.html#SECTION006600000000000000000"/>
-<tocsect3 name="4.7 More on Defining Functions " url="tut/node6.html#SECTION006700000000000000000">
-<tocsect4 name="4.7.1 Default Argument Values " url="tut/node6.html#SECTION006710000000000000000"/>
-<tocsect4 name="4.7.2 Keyword Arguments " url="tut/node6.html#SECTION006720000000000000000"/>
-<tocsect4 name="4.7.3 Arbitrary Argument Lists " url="tut/node6.html#SECTION006730000000000000000"/>
-<tocsect4 name="4.7.4 Lambda Forms " url="tut/node6.html#SECTION006740000000000000000"/>
-<tocsect4 name="4.7.5 Documentation Strings " url="tut/node6.html#SECTION006750000000000000000"/>
-</tocsect3>
-</tocsect2>
-<tocsect2 name="5. Data Structures " url="tut/node7.html">
-<tocsect3 name="5.1 More on Lists " url="tut/node7.html#SECTION007100000000000000000">
-<tocsect4 name="5.1.1 Using Lists as Stacks " url="tut/node7.html#SECTION007110000000000000000"/>
-<tocsect4 name="5.1.2 Using Lists as Queues " url="tut/node7.html#SECTION007120000000000000000"/>
-<tocsect4 name="5.1.3 Functional Programming Tools " url="tut/node7.html#SECTION007130000000000000000"/>
-<tocsect4 name="5.1.4 List Comprehensions" url="tut/node7.html#SECTION007140000000000000000"/>
-</tocsect3>
-<tocsect3 name="5.2 The del statement " url="tut/node7.html#SECTION007200000000000000000"/>
-<tocsect3 name="5.3 Tuples and Sequences " url="tut/node7.html#SECTION007300000000000000000"/>
-<tocsect3 name="5.4 Dictionaries " url="tut/node7.html#SECTION007400000000000000000"/>
-<tocsect3 name="5.5 More on Conditions " url="tut/node7.html#SECTION007500000000000000000"/>
-<tocsect3 name="5.6 Comparing Sequences and Other Types " url="tut/node7.html#SECTION007600000000000000000"/>
-</tocsect2>
-<tocsect2 name="6. Modules " url="tut/node8.html">
-<tocsect3 name="6.1 More on Modules " url="tut/node8.html#SECTION008100000000000000000">
-<tocsect4 name="6.1.1 The Module Search Path " url="tut/node8.html#SECTION008110000000000000000"/>
-<tocsect4 name="6.1.2 ``Compiled'' Python files" url="tut/node8.html#SECTION008120000000000000000"/>
-</tocsect3>
-<tocsect3 name="6.2 Standard Modules " url="tut/node8.html#SECTION008200000000000000000"/>
-<tocsect3 name="6.3 The dir() Function " url="tut/node8.html#SECTION008300000000000000000"/>
-<tocsect3 name="6.4 Packages " url="tut/node8.html#SECTION008400000000000000000">
-<tocsect4 name="6.4.1 Importing * From a Package " url="tut/node8.html#SECTION008410000000000000000"/>
-<tocsect4 name="6.4.2 Intra-package References" url="tut/node8.html#SECTION008420000000000000000"/>
-</tocsect3>
-</tocsect2>
-<tocsect2 name="7. Input and Output " url="tut/node9.html">
-<tocsect3 name="7.1 Fancier Output Formatting " url="tut/node9.html#SECTION009100000000000000000"/>
-<tocsect3 name="7.2 Reading and Writing Files " url="tut/node9.html#SECTION009200000000000000000">
-<tocsect4 name="7.2.1 Methods of File Objects " url="tut/node9.html#SECTION009210000000000000000"/>
-<tocsect4 name="7.2.2 The pickle Module " url="tut/node9.html#SECTION009220000000000000000"/>
-</tocsect3>
-</tocsect2>
-<tocsect2 name="8. Errors and Exceptions " url="tut/node10.html">
-<tocsect3 name="8.1 Syntax Errors " url="tut/node10.html#SECTION0010100000000000000000"/>
-<tocsect3 name="8.2 Exceptions " url="tut/node10.html#SECTION0010200000000000000000"/>
-<tocsect3 name="8.3 Handling Exceptions " url="tut/node10.html#SECTION0010300000000000000000"/>
-<tocsect3 name="8.4 Raising Exceptions " url="tut/node10.html#SECTION0010400000000000000000"/>
-<tocsect3 name="8.5 User-defined Exceptions " url="tut/node10.html#SECTION0010500000000000000000"/>
-<tocsect3 name="8.6 Defining Clean-up Actions " url="tut/node10.html#SECTION0010600000000000000000"/>
-</tocsect2>
-<tocsect2 name="9. Classes " url="tut/node11.html">
-<tocsect3 name="9.1 A Word About Terminology " url="tut/node11.html#SECTION0011100000000000000000"/>
-<tocsect3 name="9.2 Python Scopes and Name Spaces " url="tut/node11.html#SECTION0011200000000000000000"/>
-<tocsect3 name="9.3 A First Look at Classes " url="tut/node11.html#SECTION0011300000000000000000">
-<tocsect4 name="9.3.1 Class Definition Syntax " url="tut/node11.html#SECTION0011310000000000000000"/>
-<tocsect4 name="9.3.2 Class Objects " url="tut/node11.html#SECTION0011320000000000000000"/>
-<tocsect4 name="9.3.3 Instance Objects " url="tut/node11.html#SECTION0011330000000000000000"/>
-<tocsect4 name="9.3.4 Method Objects " url="tut/node11.html#SECTION0011340000000000000000"/>
-</tocsect3>
-<tocsect3 name="9.4 Random Remarks " url="tut/node11.html#SECTION0011400000000000000000"/>
-<tocsect3 name="9.5 Inheritance " url="tut/node11.html#SECTION0011500000000000000000">
-<tocsect4 name="9.5.1 Multiple Inheritance " url="tut/node11.html#SECTION0011510000000000000000"/>
-</tocsect3>
-<tocsect3 name="9.6 Private Variables " url="tut/node11.html#SECTION0011600000000000000000"/>
-<tocsect3 name="9.7 Odds and Ends " url="tut/node11.html#SECTION0011700000000000000000">
-<tocsect4 name="9.7.1 Exceptions Can Be Classes " url="tut/node11.html#SECTION0011710000000000000000"/>
-</tocsect3>
-</tocsect2>
-<tocsect2 name="10. What Now? " url="tut/node12.html">
-<tocsect3 name="A.1 Line Editing " url="tut/node13.html#SECTION0013100000000000000000"/>
-<tocsect3 name="A.2 History Substitution " url="tut/node13.html#SECTION0013200000000000000000"/>
-<tocsect3 name="A.3 Key Bindings " url="tut/node13.html#SECTION0013300000000000000000"/>
-<tocsect3 name="A.4 Commentary " url="tut/node13.html#SECTION0013400000000000000000"/>
-</tocsect2>
-<tocsect2 name="About this document ..." url="tut/node14.html"/>
-</tocsect1>
-<tocsect1 name="Language Reference" url="ref/ref.html">
-<tocsect2 name="Front Matter" url="ref/front.html"/>
-<tocsect2 name="Contents" url="ref/contents.html"/>
-<tocsect2 name="1. Introduction" url="ref/introduction.html">
-<tocsect3 name="1.1 Notation" url="ref/notation.html"/>
-</tocsect2>
-<tocsect2 name="2. Lexical analysis" url="ref/lexical.html">
-<tocsect3 name="2.1 Line structure" url="ref/line-structure.html">
-<tocsect4 name="2.1.1 Logical lines" url="ref/logical.html"/>
-<tocsect4 name="2.1.2 Physical lines" url="ref/physical.html"/>
-<tocsect4 name="2.1.3 Comments" url="ref/comments.html"/>
-<tocsect4 name="2.1.4 Explicit line joining" url="ref/explicit-joining.html"/>
-<tocsect4 name="2.1.5 Implicit line joining" url="ref/implicit-joining.html"/>
-<tocsect4 name="2.1.6 Blank lines " url="ref/blank-lines.html"/>
-<tocsect4 name="2.1.7 Indentation" url="ref/indentation.html"/>
-<tocsect4 name="2.1.8 Whitespace between tokens" url="ref/whitespace.html"/>
-</tocsect3>
-<tocsect3 name="2.2 Other tokens" url="ref/other-tokens.html"/>
-<tocsect3 name="2.3 Identifiers and keywords" url="ref/identifiers.html">
-<tocsect4 name="2.3.1 Keywords" url="ref/keywords.html"/>
-<tocsect4 name="2.3.2 Reserved classes of identifiers" url="ref/id-classes.html"/>
-</tocsect3>
-<tocsect3 name="2.4 Literals" url="ref/literals.html">
-<tocsect4 name="2.4.1 String literals" url="ref/strings.html"/>
-<tocsect4 name="2.4.2 String literal concatenation" url="ref/string-catenation.html"/>
-<tocsect4 name="2.4.3 Numeric literals" url="ref/numbers.html"/>
-<tocsect4 name="2.4.4 Integer and long integer literals" url="ref/integers.html"/>
-<tocsect4 name="2.4.5 Floating point literals" url="ref/floating.html"/>
-<tocsect4 name="2.4.6 Imaginary literals" url="ref/imaginary.html"/>
-</tocsect3>
-<tocsect3 name="2.5 Operators" url="ref/operators.html"/>
-<tocsect3 name="2.6 Delimiters" url="ref/delimiters.html"/>
-</tocsect2>
-<tocsect2 name="3. Data model" url="ref/datamodel.html">
-<tocsect3 name="3.1 Objects, values and types" url="ref/objects.html"/>
-<tocsect3 name="3.2 The standard type hierarchy" url="ref/types.html"/>
-<tocsect3 name="3.3 Special method names" url="ref/specialnames.html">
-<tocsect4 name="3.3.1 Basic customization" url="ref/customization.html"/>
-<tocsect4 name="3.3.2 Customizing attribute access" url="ref/attribute-access.html"/>
-<tocsect4 name="3.3.3 Emulating callable objects" url="ref/callable-types.html"/>
-<tocsect4 name="3.3.4 Emulating sequence and mapping types" url="ref/sequence-types.html"/>
-<tocsect4 name="3.3.5 Additional methods for emulation of sequence types " url="ref/sequence-methods.html"/>
-<tocsect4 name="3.3.6 Emulating numeric types" url="ref/numeric-types.html"/>
-</tocsect3>
-</tocsect2>
-<tocsect2 name="4. Execution model " url="ref/execmodel.html">
-<tocsect3 name="4.1 Code blocks, execution frames, and namespaces " url="ref/execframes.html"/>
-<tocsect3 name="4.2 Exceptions " url="ref/exceptions.html"/>
-</tocsect2>
-<tocsect2 name="5. Expressions" url="ref/expressions.html">
-<tocsect3 name="5.1 Arithmetic conversions" url="ref/conversions.html"/>
-<tocsect3 name="5.2 Atoms" url="ref/atoms.html">
-<tocsect4 name="5.2.1 Identifiers (Names)" url="ref/atom-identifiers.html"/>
-<tocsect4 name="5.2.2 Literals" url="ref/atom-literals.html"/>
-<tocsect4 name="5.2.3 Parenthesized forms" url="ref/parenthesized.html"/>
-<tocsect4 name="5.2.4 List displays" url="ref/lists.html"/>
-<tocsect4 name="5.2.5 Dictionary displays" url="ref/dict.html"/>
-<tocsect4 name="5.2.6 String conversions" url="ref/string-conversions.html"/>
-</tocsect3>
-<tocsect3 name="5.3 Primaries" url="ref/primaries.html">
-<tocsect4 name="5.3.1 Attribute references" url="ref/attribute-references.html"/>
-<tocsect4 name="5.3.2 Subscriptions" url="ref/subscriptions.html"/>
-<tocsect4 name="5.3.3 Slicings" url="ref/slicings.html"/>
-<tocsect4 name="5.3.4 Calls" url="ref/calls.html"/>
-</tocsect3>
-<tocsect3 name="5.4 The power operator" url="ref/power.html"/>
-<tocsect3 name="5.5 Unary arithmetic operations " url="ref/unary.html"/>
-<tocsect3 name="5.6 Binary arithmetic operations" url="ref/binary.html"/>
-<tocsect3 name="5.7 Shifting operations" url="ref/shifting.html"/>
-<tocsect3 name="5.8 Binary bit-wise operations" url="ref/bitwise.html"/>
-<tocsect3 name="5.9 Comparisons" url="ref/comparisons.html"/>
-<tocsect3 name="5.10 Boolean operations" url="ref/lambda.html"/>
-<tocsect3 name="5.11 Expression lists" url="ref/exprlists.html"/>
-<tocsect3 name="5.12 Summary" url="ref/summary.html"/>
-</tocsect2>
-<tocsect2 name="6. Simple statements " url="ref/simple.html">
-<tocsect3 name="6.1 Expression statements " url="ref/exprstmts.html"/>
-<tocsect3 name="6.2 Assert statements " url="ref/assert.html"/>
-<tocsect3 name="6.3 Assignment statements " url="ref/assignment.html">
-<tocsect4 name="6.3.1 Augmented Assignment statements " url="ref/augassign.html"/>
-</tocsect3>
-<tocsect3 name="6.4 The pass statement " url="ref/pass.html"/>
-<tocsect3 name="6.5 The del statement " url="ref/del.html"/>
-<tocsect3 name="6.6 The print statement " url="ref/print.html"/>
-<tocsect3 name="6.7 The return statement " url="ref/return.html"/>
-<tocsect3 name="6.8 The raise statement " url="ref/raise.html"/>
-<tocsect3 name="6.9 The break statement " url="ref/break.html"/>
-<tocsect3 name="6.10 The continue statement " url="ref/continue.html"/>
-<tocsect3 name="6.11 The import statement " url="ref/import.html"/>
-<tocsect3 name="6.12 The global statement " url="ref/global.html"/>
-<tocsect3 name="6.13 The exec statement " url="ref/exec.html"/>
-</tocsect2>
-<tocsect2 name="7. Compound statements" url="ref/compound.html">
-<tocsect3 name="7.1 The if statement" url="ref/if.html"/>
-<tocsect3 name="7.2 The while statement" url="ref/while.html"/>
-<tocsect3 name="7.3 The for statement" url="ref/for.html"/>
-<tocsect3 name="7.4 The try statement" url="ref/try.html"/>
-<tocsect3 name="7.5 Function definitions" url="ref/function.html"/>
-<tocsect3 name="7.6 Class definitions" url="ref/class.html"/>
-</tocsect2>
-<tocsect2 name="8. Top-level components" url="ref/top-level.html">
-<tocsect3 name="8.1 Complete Python programs" url="ref/programs.html"/>
-<tocsect3 name="8.2 File input" url="ref/file-input.html"/>
-<tocsect3 name="8.3 Interactive input" url="ref/interactive.html"/>
-<tocsect3 name="8.4 Expression input" url="ref/expression-input.html"/>
-</tocsect2>
-<tocsect2 name="Index" url="ref/genindex.html"/>
-<tocsect2 name="About this document ..." url="ref/about.html"/>
-</tocsect1>
-<tocsect1 name="Extending and Embedding" url="ext/ext.html">
-<tocsect2 name="Front Matter" url="ext/front.html"/>
-<tocsect2 name="Contents" url="ext/contents.html"/>
 ** Diff limit reached (max: 250 lines) **