[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/util pagespanpaper.py pages...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire/util pagespanpaper.py pages... |
Date: |
Thu, 10 Apr 2003 14:01:50 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/04/10 14:01:50
Modified files:
org/fenfire/util: pagespanpaper.py pagespanpaper.test
Log message:
Fix to work with fixed vob package
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/util/pagespanpaper.py
diff -u fenfire/org/fenfire/util/pagespanpaper.py:1.2
fenfire/org/fenfire/util/pagespanpaper.py:1.3
--- fenfire/org/fenfire/util/pagespanpaper.py:1.2 Wed Mar 26 14:04:48 2003
+++ fenfire/org/fenfire/util/pagespanpaper.py Thu Apr 10 14:01:50 2003
@@ -21,13 +21,7 @@
#
import org
-# print dir(org.nongnu.libvob.putil)
-# from org.nongnu.libvob.putil.nvcode import parseCombiner
-
-# parseCombiner = org.nongnu.libvob.putil.nvcode.parseCombiner
-# XXX
-
-execfile("../libvob/org/nongnu/libvob/putil/nvcode.py")
+from vob.putil.nvcode import parseCombiner
from org.nongnu.libvob.gl import GL
from org.fenfire.util import PageSpanPaper
Index: fenfire/org/fenfire/util/pagespanpaper.test
diff -u fenfire/org/fenfire/util/pagespanpaper.test:1.7
fenfire/org/fenfire/util/pagespanpaper.test:1.8
--- fenfire/org/fenfire/util/pagespanpaper.test:1.7 Thu Mar 27 05:58:14 2003
+++ fenfire/org/fenfire/util/pagespanpaper.test Thu Apr 10 14:01:50 2003
@@ -34,13 +34,9 @@
del(sys.modules["org"])
del sys.modules["org.nongnu"]
del sys.modules["org.nongnu.libvob"]
-import org.nongnu
-import org.nongnu.libvob
-import org.nongnu.libvob.paper
-import org.nongnu.libvob.paper.papermill
-from org.nongnu import libvob as vob
+import vob
from org.nongnu import alph
from org.nongnu import storm
@@ -51,17 +47,14 @@
from org.fenfire.test import gfx
import sys
-del sys.modules["org"]
-# del sys.modules["org.nongnu.libvob.paper"]
-import imp
-print "libvob: ",org.nongnu.libvob,"\n"
-# org.nongnu.libvob.__path__ = "../libvob/org/nongnu/libvob"
+import vob.paper
+import vob.paper.papermill
+
+print "vob",dir(vob)
+print "vob.gl",dir(vob.gl)
-import org.nongnu.libvob.paper
-print "PAPER MOD:'", org, org.nongnu, org.nongnu.libvob,
org.nongnu.libvob.paper,"'\n\n"
-import org.nongnu.libvob.paper.papermill
fenfire.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
fenfire.util.PageSpanPaper.paperMillWindow = fenfire.test.gfx.win
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/util pagespanpaper.py pages...,
Tuomas J. Lukka <=