[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./rst2any.py navidoc/__init__.py navido...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] navidoc ./rst2any.py navidoc/__init__.py navido... |
|
Date: |
Fri, 21 Mar 2003 09:35:53 -0500 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/03/21 09:35:53
Modified files:
. : rst2any.py
navidoc : __init__.py
navidoc/directives: pegboard.py
Log message:
still som bugs left for pegboard...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/__init__.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/pegboard.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: navidoc/navidoc/__init__.py
diff -u navidoc/navidoc/__init__.py:1.4 navidoc/navidoc/__init__.py:1.5
--- navidoc/navidoc/__init__.py:1.4 Fri Mar 21 05:36:27 2003
+++ navidoc/navidoc/__init__.py Fri Mar 21 09:35:53 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: __init__.py,v 1.4 2003/03/21 10:36:27 humppake Exp $
+#$Id: __init__.py,v 1.5 2003/03/21 14:35:53 humppake Exp $
#
# Written by Asko Soukka
@@ -31,6 +31,8 @@
import config
import navidoc.directives
+#import navidoc.utils.path
+#docutils.utils.relative_path = navidoc.utils.path.relative_path
def docutils_system_message(self, level, message, *children, **kwargs):
"""
@@ -43,7 +45,7 @@
if kwargs.has_key('category'):
del attributes['category']
if kwargs.has_key('base_node'):
- source, line = get_source_line(kwargs['base_node'])
+ source, line = docutils.utils.get_source_line(kwargs['base_node'])
del attributes['base_node']
if source is not None:
attributes.setdefault('source', source)
Index: navidoc/navidoc/directives/pegboard.py
diff -u navidoc/navidoc/directives/pegboard.py:1.5
navidoc/navidoc/directives/pegboard.py:1.6
--- navidoc/navidoc/directives/pegboard.py:1.5 Fri Mar 21 08:23:36 2003
+++ navidoc/navidoc/directives/pegboard.py Fri Mar 21 09:35:53 2003
@@ -46,11 +46,11 @@
Sorts pegs primarily in descending priority order of status
and secondarily in descending time stamp.
"""
- if priority.has_key(a['status'].capitalize().split()[0]) \
- and priority.has_key(b['status'].capitalize().split()[0]) \
+ if config.pegboard_priorities.has_key(a['status'].capitalize().split()[0])
\
+ and
config.pegboard_priorities.has_key(b['status'].capitalize().split()[0]) \
and not a['status'].lower().split() == b['status'].lower().split():
- return priority[a['status'].capitalize().split()[0]] \
- > priority[b['status'].capitalize().split()[0]] or -1
+ return config.pegboard_priorities[a['status'].capitalize().split()[0]]
\
+ >
config.pegboard_priorities[b['status'].capitalize().split()[0]] or -1
as = a['last-modified'].split('-')
bs = b['last-modified'].split('-')
@@ -119,16 +119,18 @@
dbg('processing PEG ' + pegdir)
config.working_directory = _slashify(init_working_directory)+pegdir
- peg = {'authors': [], 'status': undefined, 'topic': pegdir,
'stakeholders': [],
- 'last-modified': '', 'dir': pegdir, 'files': '', 'html': '',
'rst': '',
- 'rstfiles': [], 'cvsignore': [] }
+ peg = {'authors': [], 'status': config.pegboard_undefined, 'topic':
pegdir,
+ 'stakeholders': [], 'last-modified': '', 'dir': pegdir,
'files': '',
+ 'html': '', 'rst': '', 'rstfiles': [], 'cvsignore': [] }
- peg['files'] = [f for f in os.list(config.working_directory) \
+ peg['files'] = [f for f in os.listdir(config.working_directory) \
if
os.path.isfile(_slashify(config.working_directory)+f)
and not f.startswith('.') and '#' not in f and '~' not
in f]
- if peg['files'].find('peg.rst') != -1: peg['rst'] = 'peg.rst'
- else:
+ try:
+ index = peg['files'].index('peg.rst')
+ peg['rst'] = peg['files'][index]
+ except ValueError:
for pegfile in peg['files']:
if pegfile.endswith('.rst'):
peg['rst'] = pegfile
@@ -139,7 +141,8 @@
pub = Publisher()
pub.set_reader('standalone', None, 'restructuredtext')
filename = _slashify(config.working_directory)+rstfile
- pub.process_command_line(argv="--config "+config.docutils+"
"+filename+"".split())
+ #" tmp" at the end of the next line is for jython to avoid
negative arraylength :)
+ pub.process_command_line(argv=("--config "+config.docutils+"
"+filename+" tmp").split())
#conversion may fail because of bad restructuredtext
try:
@@ -158,7 +161,7 @@
#we may have got 'rawsource', which needs some tidying
if peg['last-modified'].startswith('$Date'):
peg['last-modified'] =
peg['last-modified'][7:len(peg['last-modified'])-11].replace('/', '-')
- peg['status'] = getTagValue(document, 'status') or
undefined
+ peg['status'] = getTagValue(document, 'status') or
config.pegboard_undefined
stakeholders = getFieldTagValue(document, 'stakeholder')
if not stakeholders:
stakeholders = getFieldTagValue(document,
'stakeholders')
@@ -184,6 +187,7 @@
#finally adds peg's metadata into pegtable
pegtable.append(peg)
+ return pegtable
#create the ``.. pegboard::`` directive
def pegboard_directive(*args):
@@ -227,7 +231,8 @@
tbody += row
def get_author(s):
- if authors.has_key(s): return authors[s]
+ if config.pegboard_authors.has_key(s):
+ return config.pegboard_authors[s]
else: return s
_authors = [get_author(s) for s in peg['authors']]
@@ -294,7 +299,6 @@
para += __node
return entry
-
def make_files(peg):
# again, cpython and 'class'
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.9 navidoc/rst2any.py:1.10
--- navidoc/rst2any.py:1.9 Fri Mar 21 05:36:27 2003
+++ navidoc/rst2any.py Fri Mar 21 09:35:53 2003
@@ -71,7 +71,9 @@
"""
Runs docutils for a single file.
"""
- output = input.split(".")[0]
+ last_dot = input.rfind('.')
+ if last_dot != -1: output = input[:last_dot]
+ else: output = input
dbg_config("Working directory: "+config.working_directory)
dbg_config("Input file: "+config.input_filename)