[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc/navidoc directives/__init__.py directiv...
From: |
Asko Soukka |
Subject: |
[Gzz-commits] navidoc/navidoc directives/__init__.py directiv... |
Date: |
Fri, 21 Mar 2003 08:23:37 -0500 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/03/21 08:23:37
Modified files:
navidoc/directives: __init__.py pegboard.py
navidoc/utils : debug.py
Added files:
navidoc/modules: .cvsignore
Log message:
fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/pegboard.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/.cvsignore?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/utils/debug.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: navidoc/navidoc/directives/__init__.py
diff -u navidoc/navidoc/directives/__init__.py:1.2
navidoc/navidoc/directives/__init__.py:1.3
--- navidoc/navidoc/directives/__init__.py:1.2 Wed Mar 19 10:34:02 2003
+++ navidoc/navidoc/directives/__init__.py Fri Mar 21 08:23:36 2003
@@ -25,8 +25,8 @@
__docformat__ = 'reStructuredText'
-import docutils
+import docutils.parsers.rst.directives
-#from navidoc.directives.pegboard import pegboard_directive
+from navidoc.directives.pegboard import pegboard_directive
-#docutils.parsers.rst.directives._directives['pegboard'] = pegboard_directive
+docutils.parsers.rst.directives._directives['pegboard'] = pegboard_directive
Index: navidoc/navidoc/directives/pegboard.py
diff -u navidoc/navidoc/directives/pegboard.py:1.4
navidoc/navidoc/directives/pegboard.py:1.5
--- navidoc/navidoc/directives/pegboard.py:1.4 Fri Mar 21 05:36:28 2003
+++ navidoc/navidoc/directives/pegboard.py Fri Mar 21 08:23:36 2003
@@ -148,26 +148,26 @@
pub.apply_transforms(document)
peg['cvsignore'].append(rstfile[0:len(rstfile)-4]+'.gen.html')
- #conversion have succeeded so far, parsing peg's metadata
- #from its document tree
- if rstfile == peg['rst']:
- peg['html'] = rstfile[0:len(rstfile)-4]+'.gen.html'
- peg['topic'] = getTagValue(document, 'title', always_raw=1)
- peg['topic'] = peg['topic']
- peg['last-modified'] = getFieldTagValue(document,
'last-modified')
- #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
- stakeholders = getFieldTagValue(document, 'stakeholder')
- if not stakeholders:
- stakeholders = getFieldTagValue(document,
'stakeholders')
- peg['stakeholders'] = [s.strip() for s in
stakeholders.split(',')]
- peg['authors'] = getTagValue(document, 'author', all=1)
- else:
- status = getTagValue(document, 'status')
- if status:
- peg['rstfiles'].append({'filename': rstfile, 'status':
status})
+ #conversion have succeeded so far, parsing peg's metadata
+ #from its document tree
+ if rstfile == peg['rst']:
+ peg['html'] = rstfile[0:len(rstfile)-4]+'.gen.html'
+ peg['topic'] = getTagValue(document, 'title', always_raw=1)
+ peg['topic'] = peg['topic']
+ peg['last-modified'] = getFieldTagValue(document,
'last-modified')
+ #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
+ stakeholders = getFieldTagValue(document, 'stakeholder')
+ if not stakeholders:
+ stakeholders = getFieldTagValue(document,
'stakeholders')
+ peg['stakeholders'] = [s.strip() for s in
stakeholders.split(',')]
+ peg['authors'] = getTagValue(document, 'author', all=1)
+ else:
+ status = getTagValue(document, 'status')
+ if status:
+ peg['rstfiles'].append({'filename': rstfile, 'status':
status})
except:
dbg_fail('PEG %s: Docutil raised an exception while converting
%s. ' % (pegdir, rstfile))
Index: navidoc/navidoc/utils/debug.py
diff -u navidoc/navidoc/utils/debug.py:1.6 navidoc/navidoc/utils/debug.py:1.7
--- navidoc/navidoc/utils/debug.py:1.6 Fri Mar 21 05:36:28 2003
+++ navidoc/navidoc/utils/debug.py Fri Mar 21 08:23:36 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: debug.py,v 1.6 2003/03/21 10:36:28 humppake Exp $
+#$Id: debug.py,v 1.7 2003/03/21 13:23:36 humppake Exp $
#
# Written by Asko Soukka
@@ -49,15 +49,16 @@
if self.output_enabled.has_key(dbg_name):
print "[", dbg_name, "]", dbg_str
else:
- if not buffer.haskey(dbg_name): buffer['dbg_name'] = []
- buffer['dbg_name'].append(dbg_str)
+ if not self.buffer.has_key(dbg_name):
+ self.buffer['dbg_name'] = []
+ self.buffer['dbg_name'].append(dbg_str)
def shorthand(self, dbg_name):
return lambda dbg_string, self=self, dbg_name=dbg_name: \
self.out(dbg_name, dbg_string)
def flush(self, dbg_name):
- if buffer.haskey(dbg_name):
- for line in buffer['dbg_name']:
+ if self.buffer.has_key(dbg_name):
+ for line in self.buffer['dbg_name']:
print "[", dbg_name, "]", line
- buffer['dbg_name'] = []
+ self.buffer['dbg_name'] = []
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc/navidoc directives/__init__.py directiv...,
Asko Soukka <=