[Python-modules-commits] [python-odf] 07/10: Import python-odf_1.3.3+dfsg.orig.tar.xz
Wolfgang Borgert
debacle at moszumanska.debian.org
Fri Dec 23 23:33:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch master
in repository python-odf.
commit ad9185961f35530a2321d4f3d09461b2404fc8af
Author: W. Martin Borgert <debacle at debian.org>
Date: Fri Dec 23 22:54:17 2016 +0000
Import python-odf_1.3.3+dfsg.orig.tar.xz
---
config.dox | 2 +-
csv2ods/csv2ods.1 | 270 ++++++++++++++++++++++++++++++++++++++++++
mailodf/mailodf.1 | 232 +++++++++++++++++++++++++++++++++++++
odf/anim.py | 4 +-
odf/attrconverters.py | 2 +-
odf/chart.py | 4 +-
odf/config.py | 4 +-
odf/dc.py | 4 +-
odf/dr3d.py | 6 +-
odf/draw.py | 4 +-
odf/easyliststyle.py | 4 +-
odf/element.py | 6 +-
odf/elementtypes.py | 2 +-
odf/form.py | 4 +-
odf/grammar.py | 2 +-
odf/load.py | 4 +-
odf/manifest.py | 5 +-
odf/math.py | 4 +-
odf/meta.py | 4 +-
odf/namespaces.py | 2 +-
odf/number.py | 6 +-
odf/odf2moinmoin.py | 4 +-
odf/odf2xhtml.py | 13 ++-
odf/office.py | 6 +-
odf/opendocument.py | 46 ++++----
odf/presentation.py | 4 +-
odf/script.py | 4 +-
odf/style.py | 4 +-
odf/svg.py | 6 +-
odf/table.py | 4 +-
odf/text.py | 6 +-
odf/xforms.py | 4 +-
odf2mht/odf2mht.1 | 239 ++++++++++++++++++++++++++++++++++++++
odf2xhtml/odf2xhtml.1 | 221 +++++++++++++++++++++++++++++++++++
odf2xml/odf2xml.1 | 231 ++++++++++++++++++++++++++++++++++++
odfimgimport/odfimgimport.1 | 227 ++++++++++++++++++++++++++++++++++++
odflint/odflint.1 | 217 ++++++++++++++++++++++++++++++++++
odfmeta/odfmeta.1 | 277 ++++++++++++++++++++++++++++++++++++++++++++
odfoutline/odfoutline.1 | 213 ++++++++++++++++++++++++++++++++++
odfuserfield/odfuserfield.1 | 267 ++++++++++++++++++++++++++++++++++++++++++
setup.py | 2 +-
xml2odf/xml2odf.1 | 235 +++++++++++++++++++++++++++++++++++++
42 files changed, 2718 insertions(+), 87 deletions(-)
diff --git a/config.dox b/config.dox
index 257dfde..bf460ff 100644
--- a/config.dox
+++ b/config.dox
@@ -1127,7 +1127,7 @@ HTML_COLORSTYLE_GAMMA = 80
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_TIMESTAMP = YES
+HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
diff --git a/csv2ods/csv2ods.1 b/csv2ods/csv2ods.1
new file mode 100644
index 0000000..e73e9b0
--- /dev/null
+++ b/csv2ods/csv2ods.1
@@ -0,0 +1,270 @@
+.\" Title: csv2ods
+.\" Author: Agustin Henze <agustinhenze at gmail.com>
+.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+.\" Date: 01/04/2009
+.\" Manual: User commands
+.\" Source: odfpy
+.\" Language: English
+.\"
+.TH "CSV2ODS" "1" "01/04/2009" "odfpy" "User commands"
+.\" -----------------------------------------------------------------
+.\" * (re)Define some macros
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" toupper - uppercase a string (locale-aware)
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de toupper
+.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+\\$*
+.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH-xref - format a cross-reference to an SH section
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de SH-xref
+.ie n \{\
+.\}
+.toupper \\$*
+.el \{\
+\\$*
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH - level-one heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SH
+.\" put an extra blank line of space above the head in non-TTY output
+.if t \{\
+.sp 1
+.\}
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[an-margin]u
+.ti 0
+.HTML-TAG ".NH \\n[an-level]"
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+\." make the size of the head bigger
+.ps +3
+.ft B
+.ne (2v + 1u)
+.ie n \{\
+.\" if n (TTY output), use uppercase
+.toupper \\$*
+.\}
+.el \{\
+.nr an-break-flag 0
+.\" if not n (not TTY), use normal case (not uppercase)
+\\$1
+.in \\n[an-margin]u
+.ti 0
+.\" if not n (not TTY), put a border/line under subheading
+.sp -.6
+\l'\n(.lu'
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SS - level-two heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SS
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[IN]u
+.ti \\n[SN]u
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.ps \\n[PS-SS]u
+\." make the size of the head bigger
+.ps +2
+.ft B
+.ne (2v + 1u)
+.if \\n[.$] \&\\$*
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BB/BE - put background/screen (filled box) around block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BB
+.if t \{\
+.sp -.5
+.br
+.in +2n
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EB
+.if t \{\
+.if "\\$2"adjust-for-leading-newline" \{\
+.sp -1
+.\}
+.br
+.di
+.in
+.ll
+.gcolor
+.nr BW \\n(.lu-\\n(.i
+.nr BH \\n(dn+.5v
+.ne \\n(BHu+.5v
+.ie "\\$2"adjust-for-leading-newline" \{\
+\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.el \{\
+\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.in 0
+.sp -.5v
+.nf
+.BX
+.in
+.sp .5v
+.fi
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BM/EM - put colored marker in margin next to block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BM
+.if t \{\
+.br
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EM
+.if t \{\
+.br
+.di
+.ll
+.gcolor
+.nr BH \\n(dn
+.ne \\n(BHu
+\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+.in 0
+.nf
+.BX
+.in
+.fi
+.\}
+..
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "Name"
+csv2ods \- Create OpenDocument spreadsheet from comma separated values
+.SH "Synopsis"
+.fam C
+.HP \w'\fBcsv2ods\fR\ 'u
+\fBcsv2ods\fR \-i\ \fIfile\&.csv\fR \-o\ \fIfile\&.ods\fR
+.fam
+.SH "Description"
+.PP
+This program reads a file in CSV format \- table of columns delimited by commas, tabs or any other character\&. It then creates a spreadsheet\&. If a value looks like a number the cell is formatted as a number as well\&.
+.SH "Options"
+.PP
+\-\-version
+.RS 4
+Show program\'s version number and exit
+.RE
+.PP
+\-h, \-\-help
+.RS 4
+Show help message and exit
+.RE
+.PP
+\-i \fIINPUT\fR, \-\-input=\fIINPUT\fR
+.RS 4
+File input in csv\&.
+.RE
+.PP
+\-o \fIOUTPUT\fR, \-\-output=\fIOUTPUT\fR
+.RS 4
+File output in ods\&.
+.RE
+.PP
+\-d \fIDELIMITER\fR, \-\-delimiter=\fIDELIMITER\fR
+.RS 4
+Specifies a one\-character string to use as the field separator\&. It defaults to ","\&.
+.RE
+.PP
+\-c \fIENCODING\fR, \-\-encoding=\fIENCODING\fR
+.RS 4
+Specifies the encoding the file csv\&. It defaults to utf\-8\&.
+.RE
+.PP
+\-t \fITABLENAME\fR, \-\-table=\fITABLENAME\fR
+.RS 4
+The table name in the output file\&.
+.RE
+.PP
+\-s \fISKIPINITIALSPACE\fR, \-\-skipinitialspace=\fISKIPINITIALSPACE\fR
+.RS 4
+Specifies how to interpret whitespace which immediately follows a delimiter\&. It defaults to False, which means that whitespace immediately following a delimiter is part of the following field\&.
+.RE
+.PP
+\-l \fILINETERMINATOR\fR, \-\-lineterminator=\fILINETERMINATOR\fR
+.RS 4
+Specifies the character sequence which should terminate rows\&.
+.RE
+.PP
+\-q \fIQUOTING\fR, \-\-quoting=\fIQUOTING\fR
+.RS 4
+It can take on any of the following module constants: 0 = QUOTE_MINIMAL means only when required, for example, when a field contains either the quotechar or the delimiter\&. 1 = QUOTE_ALL means that quotes are always placed around fields\&. 2 = QUOTE_NONNUMERIC means that quotes are always placed around fields which do not parse as integers or floating point numbers\&. 3 = QUOTE_NONE means that quotes are never placed around fields\&. It defaults is QUOTE_MINIMAL\&.
+.RE
+.PP
+\-e \fIESCAPECHAR\fR, \-\-escapechar=\fIESCAPECHAR\fR
+.RS 4
+Specifies a one\-character string used to escape the delimiter when quoting is set to QUOTE_NONE\&.
+.RE
+.PP
+\-r \fIQUOTECHAR\fR, \-\-quotechar=\fIQUOTECHAR\fR
+.RS 4
+Specifies a one\-character string to use as the quoting character\&. It defaults to "\&.
+.RE
+.SH "Example"
+.sp
+.if n \{\
+.RS 4
+.\}
+.fam C
+.ps -1
+.nf
+.if t \{\
+.sp -1
+.\}
+.BB lightgray adjust-for-leading-newline
+.sp -1
+
+csv2ods \-i /etc/passwd \-o accounts\&.odt \-d:
+.EB lightgray adjust-for-leading-newline
+.if t \{\
+.sp 1
+.\}
+.fi
+.fam
+.ps +1
+.if n \{\
+.RE
+.\}
+.SH "Author"
+.PP
+\fBAgustin Henze\fR <\&agustinhenze at gmail\&.com\&>
+.RS 4
+Original author of csv\-ods\&.py
+.RE
diff --git a/mailodf/mailodf.1 b/mailodf/mailodf.1
new file mode 100644
index 0000000..1dcf836
--- /dev/null
+++ b/mailodf/mailodf.1
@@ -0,0 +1,232 @@
+.\" Title: mailodf
+.\" Author: S\(/oren Roug
+.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+.\" Date: 03/15/2009
+.\" Manual: User commands
+.\" Source: odfpy
+.\" Language: English
+.\"
+.TH "MAILODF" "1" "03/15/2009" "odfpy" "User commands"
+.\" -----------------------------------------------------------------
+.\" * (re)Define some macros
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" toupper - uppercase a string (locale-aware)
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de toupper
+.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+\\$*
+.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH-xref - format a cross-reference to an SH section
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de SH-xref
+.ie n \{\
+.\}
+.toupper \\$*
+.el \{\
+\\$*
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH - level-one heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SH
+.\" put an extra blank line of space above the head in non-TTY output
+.if t \{\
+.sp 1
+.\}
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[an-margin]u
+.ti 0
+.HTML-TAG ".NH \\n[an-level]"
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+\." make the size of the head bigger
+.ps +3
+.ft B
+.ne (2v + 1u)
+.ie n \{\
+.\" if n (TTY output), use uppercase
+.toupper \\$*
+.\}
+.el \{\
+.nr an-break-flag 0
+.\" if not n (not TTY), use normal case (not uppercase)
+\\$1
+.in \\n[an-margin]u
+.ti 0
+.\" if not n (not TTY), put a border/line under subheading
+.sp -.6
+\l'\n(.lu'
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SS - level-two heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SS
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[IN]u
+.ti \\n[SN]u
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.ps \\n[PS-SS]u
+\." make the size of the head bigger
+.ps +2
+.ft B
+.ne (2v + 1u)
+.if \\n[.$] \&\\$*
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BB/BE - put background/screen (filled box) around block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BB
+.if t \{\
+.sp -.5
+.br
+.in +2n
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EB
+.if t \{\
+.if "\\$2"adjust-for-leading-newline" \{\
+.sp -1
+.\}
+.br
+.di
+.in
+.ll
+.gcolor
+.nr BW \\n(.lu-\\n(.i
+.nr BH \\n(dn+.5v
+.ne \\n(BHu+.5v
+.ie "\\$2"adjust-for-leading-newline" \{\
+\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.el \{\
+\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.in 0
+.sp -.5v
+.nf
+.BX
+.in
+.sp .5v
+.fi
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BM/EM - put colored marker in margin next to block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BM
+.if t \{\
+.br
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EM
+.if t \{\
+.br
+.di
+.ll
+.gcolor
+.nr BH \\n(dn
+.ne \\n(BHu
+\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+.in 0
+.nf
+.BX
+.in
+.fi
+.\}
+..
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "Name"
+mailodf \- Email ODF file as HTML archive
+.SH "Synopsis"
+.fam C
+.HP \w'\fBmailodf\fR\ 'u
+\fBmailodf\fR [\-f\ \fIfrom\fR] [\-s\ \fIsubject\fR] \fIinputfile\fR \fIrecipients\fR...
+.fam
+.SH "Description"
+.PP
+mailodf is a program that will create a MIME\-encapsulated web archive and then sends it as an email\&. Most email programs that understand HTML understands this format\&.
+.PP
+
+\(lqInputfile\(rq
+is assumed to be an OpenDocument file of text, spreadsheet or presentation type\&.
+.SH "References"
+.RS 4
+HTTRACK (http://www\&.httrack\&.com/) can create such archives with the \-%M option\&.
+.RE
+.RS 4
+http://en\&.wikipedia\&.org/wiki/MHTML
+.RE
+.RS 4
+http://www\&.dsv\&.su\&.se/~jpalme/ietf/mhtml\&.html
+.RE
+.RS 4
+http://users\&.otenet\&.gr/~geosp/kmhtconvert/
+.RE
+.RS 4
+http://www\&.faqs\&.org/rfcs/rfc2557\&.html
+.RE
+.SH "Example"
+.sp
+.if n \{\
+.RS 4
+.\}
+.fam C
+.ps -1
+.nf
+.if t \{\
+.sp -1
+.\}
+.BB lightgray adjust-for-leading-newline
+.sp -1
+
+mailodf \-f lars\&.oppermann at sun\&.com \-s "F\&.Y\&.I" odf\-file
+.EB lightgray adjust-for-leading-newline
+.if t \{\
+.sp 1
+.\}
+.fi
+.fam
+.ps +1
+.if n \{\
+.RE
+.\}
+.SH "See Also"
+.PP
+odf2mht
+.SH "Author"
+.PP
+\fBS\(/oren Roug\fR
+.RS 4
+Original author
+.RE
diff --git a/odf/anim.py b/odf/anim.py
index 27dca36..5ab4446 100644
--- a/odf/anim.py
+++ b/odf/anim.py
@@ -18,8 +18,8 @@
# Contributor(s):
#
-from namespaces import ANIMNS
-from element import Element
+from odf.namespaces import ANIMNS
+from odf.element import Element
# Autogenerated
diff --git a/odf/attrconverters.py b/odf/attrconverters.py
index fd48f6a..79076cc 100644
--- a/odf/attrconverters.py
+++ b/odf/attrconverters.py
@@ -20,7 +20,7 @@
import sys, os.path
sys.path.append(os.path.dirname(__file__))
-from namespaces import *
+from odf.namespaces import *
import re, types
pattern_color = re.compile(r'#[0-9a-fA-F]{6}')
diff --git a/odf/chart.py b/odf/chart.py
index b05dcce..90add6b 100644
--- a/odf/chart.py
+++ b/odf/chart.py
@@ -18,8 +18,8 @@
# Contributor(s):
#
from __future__ import absolute_import
-from .namespaces import CHARTNS
-from .element import Element
+from odf.namespaces import CHARTNS
+from odf.element import Element
# Autogenerated
def Axis(**args):
diff --git a/odf/config.py b/odf/config.py
index f33f361..28222cd 100644
--- a/odf/config.py
+++ b/odf/config.py
@@ -18,8 +18,8 @@
# Contributor(s):
#
-from namespaces import CONFIGNS
-from element import Element
+from odf.namespaces import CONFIGNS
+from odf.element import Element
# Autogenerated
def ConfigItem(**args):
diff --git a/odf/dc.py b/odf/dc.py
index 7c96776..5c591cd 100644
--- a/odf/dc.py
+++ b/odf/dc.py
@@ -18,8 +18,8 @@
# Contributor(s):
#
-from namespaces import DCNS
-from element import Element
+from odf.namespaces import DCNS
+from odf.element import Element
# Autogenerated
def Creator(**args):
diff --git a/odf/dr3d.py b/odf/dr3d.py
index 989e114..a10c901 100644
--- a/odf/dr3d.py
+++ b/odf/dr3d.py
@@ -20,9 +20,9 @@
import sys, os.path
sys.path.append(os.path.dirname(__file__))
-from namespaces import DR3DNS
-from element import Element
-from draw import StyleRefElement
+from odf.namespaces import DR3DNS
+from odf.element import Element
+from odf.draw import StyleRefElement
# Autogenerated
def Cube(**args):
diff --git a/odf/draw.py b/odf/draw.py
index 122d40f..c389355 100644
--- a/odf/draw.py
+++ b/odf/draw.py
@@ -20,8 +20,8 @@
import sys, os.path
sys.path.append(os.path.dirname(__file__))
-from namespaces import DRAWNS, STYLENS, PRESENTATIONNS
-from element import Element
+from odf.namespaces import DRAWNS, STYLENS, PRESENTATIONNS
+from odf.element import Element
def StyleRefElement(stylename=None, classnames=None, **args):
qattrs = {}
diff --git a/odf/easyliststyle.py b/odf/easyliststyle.py
index 0576406..ed867ea 100644
--- a/odf/easyliststyle.py
+++ b/odf/easyliststyle.py
@@ -21,8 +21,8 @@
import re, sys, os.path
sys.path.append(os.path.dirname(__file__))
-from style import Style, TextProperties, ListLevelProperties
-from text import ListStyle,ListLevelStyleNumber,ListLevelStyleBullet
+from odf.style import Style, TextProperties, ListLevelProperties
+from odf.text import ListStyle,ListLevelStyleNumber,ListLevelStyleBullet
"""
Create a <text:list-style> element from a string or array.
diff --git a/odf/element.py b/odf/element.py
index 09e7de5..7ee9c1c 100644
--- a/odf/element.py
+++ b/odf/element.py
@@ -26,9 +26,9 @@ import sys, os.path
sys.path.append(os.path.dirname(__file__))
import xml.dom
from xml.dom.minicompat import *
-from namespaces import nsdict
-import grammar
-from attrconverters import AttrConverters
+from odf.namespaces import nsdict
+import odf.grammar as grammar
+from odf.attrconverters import AttrConverters
if sys.version_info[0] == 3:
unicode=str # unicode function does not exist
diff --git a/odf/elementtypes.py b/odf/elementtypes.py
index 7c19412..945206d 100644
--- a/odf/elementtypes.py
+++ b/odf/elementtypes.py
@@ -19,7 +19,7 @@
# Contributor(s):
#
-from namespaces import *
+from odf.namespaces import *
# Inline element don't cause a box
# They are analogous to the HTML elements SPAN, B, I etc.
diff --git a/odf/form.py b/odf/form.py
index 7969b84..d750f3f 100644
--- a/odf/form.py
+++ b/odf/form.py
@@ -18,8 +18,8 @@
# Contributor(s):
#
-from namespaces import FORMNS
-from element import Element
+from odf.namespaces import FORMNS
+from odf.element import Element
# Autogenerated
diff --git a/odf/grammar.py b/odf/grammar.py
index dca6519..612331e 100644
--- a/odf/grammar.py
+++ b/odf/grammar.py
@@ -24,7 +24,7 @@ To be used for validation check in the API
"""
import sys, os.path
sys.path.append(os.path.dirname(__file__))
-from namespaces import *
+from odf.namespaces import *
# The following code is generated from the RelaxNG schema with this notice:
diff --git a/odf/load.py b/odf/load.py
index 35bdb82..bc0f19d 100644
--- a/odf/load.py
+++ b/odf/load.py
@@ -27,8 +27,8 @@
from xml.sax import make_parser,handler
from xml.sax.xmlreader import InputSource
import xml.sax.saxutils
-from element import Element
-from namespaces import OFFICENS
+from odf.element import Element
+from odf.namespaces import OFFICENS
try:
from cStringIO import StringIO
except ImportError:
diff --git a/odf/manifest.py b/odf/manifest.py
index 1d5524f..97e9d2d 100644
--- a/odf/manifest.py
+++ b/odf/manifest.py
@@ -23,8 +23,8 @@
import sys, os.path
sys.path.append(os.path.dirname(__file__))
-from namespaces import MANIFESTNS
-from element import Element
+from odf.namespaces import MANIFESTNS
+from odf.element import Element
# Autogenerated
def Manifest(**args):
@@ -41,4 +41,3 @@ def Algorithm(**args):
def KeyDerivation(**args):
return Element(qname = (MANIFESTNS,'key-derivation'), **args)
-
diff --git a/odf/math.py b/odf/math.py
index 5dc38df..6fa2f38 100644
--- a/odf/math.py
+++ b/odf/math.py
@@ -18,8 +18,8 @@
# Contributor(s):
#
-from namespaces import MATHNS
-from element import Element
+from odf.namespaces import MATHNS
+from odf.element import Element
# ODF 1.0 section 12.5
# Mathematical content is represented by MathML 2.0
diff --git a/odf/meta.py b/odf/meta.py
index 68b1d19..d5b2899 100644
--- a/odf/meta.py
+++ b/odf/meta.py
@@ -18,8 +18,8 @@
# Contributor(s):
#
-from namespaces import METANS
-from element import Element
+from odf.namespaces import METANS
+from odf.element import Element
# Autogenerated
def AutoReload(**args):
diff --git a/odf/namespaces.py b/odf/namespaces.py
index 5c5abe2..2a779b4 100644
--- a/odf/namespaces.py
+++ b/odf/namespaces.py
@@ -17,7 +17,7 @@
#
# Contributor(s):
#
-__version__ = "1.3.2dev"
+__version__ = "1.3.3"
TOOLSVERSION = u"ODFPY/" + __version__
diff --git a/odf/number.py b/odf/number.py
index 12d81cb..a80a43a 100644
--- a/odf/number.py
+++ b/odf/number.py
@@ -18,9 +18,9 @@
# Contributor(s):
#
-from namespaces import NUMBERNS
-from element import Element
-from style import StyleElement
+from odf.namespaces import NUMBERNS
+from odf.element import Element
+from odf.style import StyleElement
# Autogenerated
diff --git a/odf/odf2moinmoin.py b/odf/odf2moinmoin.py
index 167fcda..7c7b8dd 100644
--- a/odf/odf2moinmoin.py
+++ b/odf/odf2moinmoin.py
@@ -21,8 +21,8 @@
#
import sys, zipfile, xml.dom.minidom
-from namespaces import nsdict
-from elementtypes import *
+from odf.namespaces import nsdict
+from odf.elementtypes import *
IGNORED_TAGS = [
'draw:a'
diff --git a/odf/odf2xhtml.py b/odf/odf2xhtml.py
index 8c5fbb2..e8f4b57 100644
--- a/odf/odf2xhtml.py
+++ b/odf/odf2xhtml.py
@@ -29,7 +29,7 @@ from xml.dom import Node
from opendocument import load
-from namespaces import ANIMNS, CHARTNS, CONFIGNS, DCNS, DR3DNS, DRAWNS, FONS, \
+from odf.namespaces import ANIMNS, CHARTNS, CONFIGNS, DCNS, DR3DNS, DRAWNS, FONS, \
FORMNS, MATHNS, METANS, NUMBERNS, OFFICENS, PRESENTATIONNS, SCRIPTNS, \
SMILNS, STYLENS, SVGNS, TABLENS, TEXTNS, XLINKNS
@@ -748,12 +748,15 @@ class ODF2XHTML(handler.ContentHandler):
"""
objhref = attrs[(XLINKNS,"href")]
# Remove leading "./": from "./Object 1" to "Object 1"
-# objhref = objhref [2:]
+ # objhref = objhref [2:]
# Not using os.path.join since it fails to find the file on Windows.
-# objcontentpath = '/'.join([objhref, 'content.xml'])
-
- for c in self.document.childnodes:
+ # objcontentpath = '/'.join([objhref, 'content.xml'])
+ ################################
+ # fixed: self.document.childnodes ===> self.document.childobjects
+ # 2016-02-19 G.K.
+ ################################
+ for c in self.document.childobjects:
if c.folder == objhref:
self._walknode(c.topnode)
diff --git a/odf/office.py b/odf/office.py
index 2d6b752..b2c6755 100644
--- a/odf/office.py
+++ b/odf/office.py
@@ -18,9 +18,9 @@
# Contributor(s):
#
-from namespaces import OFFICENS
-from element import Element
-from draw import StyleRefElement
+from odf.namespaces import OFFICENS
+from odf.element import Element
+from odf.draw import StyleRefElement
# Autogenerated
def Annotation(**args):
diff --git a/odf/opendocument.py b/odf/opendocument.py
index 70a6ff5..ac81273 100644
--- a/odf/opendocument.py
+++ b/odf/opendocument.py
@@ -24,7 +24,7 @@
__doc__="""Use OpenDocument to generate your documents."""
-import zipfile, time, sys, mimetypes, copy, os.path
+import zipfile, time, uuid, sys, mimetypes, copy, os.path
# to allow Python3 to access modules in the same path
sys.path.append(os.path.dirname(__file__))
@@ -34,14 +34,14 @@ sys.path.append(os.path.dirname(__file__))
# convert strings or unicode to bytes, which is valid for Python 2 and 3.
from io import StringIO, BytesIO
-from namespaces import *
-import manifest
-import meta
-from office import *
-import element
-from attrconverters import make_NCName
+from odf.namespaces import *
+import odf.manifest as manifest
+import odf.meta as meta
+from odf.office import *
+import odf.element as element
+from odf.attrconverters import make_NCName
from xml.sax.xmlreader import InputSource
-from odfmanifest import manifestlist
+from odf.odfmanifest import manifestlist
if sys.version_info[0] == 3:
unicode=str # unicode function does not exist
@@ -426,7 +426,7 @@ class OpenDocument:
except: ext=u''
else:
ext = mimetypes.guess_extension(mediatype)
- manifestfn = u"Pictures/%0.0f%s" % ((time.time()*10000000000), ext)
+ manifestfn = u"Pictures/%s%s" % (uuid.uuid4().hex.upper(), ext)
self.Pictures[manifestfn] = (IS_FILENAME, filename, mediatype)
content=b"" # this value is only use by the assert further
filename=u"" # this value is only use by the assert further
@@ -458,7 +458,7 @@ class OpenDocument:
except ValueError: ext=u''
else:
ext = mimetypes.guess_extension(mediatype)
- manifestfn = u"Pictures/%0.0f%s" % ((time.time()*10000000000), ext)
+ manifestfn = u"Pictures/%s%s" % (uuid.uuid4().hex.upper(), ext)
self.Pictures[manifestfn] = (IS_FILENAME, filename, mediatype)
assert(type(filename)==type(u""))
@@ -481,7 +481,7 @@ class OpenDocument:
assert(type(mediatype)==type(u""))
ext = mimetypes.guess_extension(mediatype)
- manifestfn = u"Pictures/%0.0f%s" % ((time.time()*10000000000), ext)
+ manifestfn = u"Pictures/%s%s" % (uuid.uuid4().hex.upper(), ext)
self.Pictures[manifestfn] = (IS_IMAGE, content, mediatype)
return manifestfn
@@ -568,8 +568,6 @@ class OpenDocument:
the ZIP content.
@param addsuffix boolean: whether to add a suffix or not; defaults to False
"""
- assert(type(outputfile)==type(u"") or 'wb' in repr(outputfile) or 'BufferedWriter' in repr(outputfile) or 'BytesIO' in repr(outputfile))
- assert(type(addsuffix)==type(True))
if outputfile == u'-':
outputfp = zipfile.ZipFile(sys.stdout,"w")
@@ -586,8 +584,6 @@ class OpenDocument:
Writes the ZIP format
@param outputfp open file descriptor
"""
- assert('wb' in repr(outputfp) or 'BufferedWriter' in repr(outputfp) or 'BytesIO' in repr(outputfp))
-
zipoutputfp = zipfile.ZipFile(outputfp,"w")
self.__zipwrite(zipoutputfp)
@@ -916,9 +912,18 @@ def __fixXmlPart(xmlpart):
u'svg', u'fo',u'draw', u'table',u'form')
for prefix in requestedPrefixes:
if u' xmlns:{prefix}'.format(prefix=prefix) not in xmlpart:
- pos=result.index(u" xmlns:")
... 2339 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-odf.git
More information about the Python-modules-commits
mailing list