1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
Description: no longer use pkg_resiyurces which is deprecated
Index: hovercraft/hovercraft/__init__.py
===================================================================
--- hovercraft.orig/hovercraft/__init__.py
+++ hovercraft/hovercraft/__init__.py
@@ -3,7 +3,6 @@ import gettext
import os
import threading
import time
-import pkg_resources
from collections import defaultdict
from http.server import HTTPServer, SimpleHTTPRequestHandler
from tempfile import TemporaryDirectory
@@ -12,7 +11,7 @@ from watchdog.events import FileSystemEv
from .generate import generate
-__version__ = pkg_resources.require("hovercraft")[0].version
+__version__ = '2.7'
class HovercraftEventHandler(FileSystemEventHandler):
Index: hovercraft/hovercraft/generate.py
===================================================================
--- hovercraft.orig/hovercraft/generate.py
+++ hovercraft/hovercraft/generate.py
@@ -2,7 +2,6 @@ import os
import re
import shutil
from lxml import etree, html
-from pkg_resources import resource_string
from .parse import rst2xml, SlideMaker
from .position import position_slides
@@ -21,7 +20,10 @@ class ResourceResolver(etree.Resolver):
def resolve(self, url, pubid, context):
if url.startswith("resource:"):
prefix, filename = url.split(":", 1)
- return self.resolve_string(resource_string(__name__, filename), context)
+ #return self.resolve_string(resource_string(__name__, filename), context)
+ return self.resolve_string(
+ open(os.path.join(os.path.dirname(__file__), filename)).read(),
+ context)
def rst2html(
Index: hovercraft/tests/test_position.py
===================================================================
--- hovercraft.orig/tests/test_position.py
+++ hovercraft/tests/test_position.py
@@ -1,6 +1,6 @@
import os
import unittest
-from pkg_resources import resource_string
+import os
from lxml import etree
from hovercraft.parse import rst2xml, SlideMaker
@@ -11,7 +11,7 @@ TEST_DATA = os.path.join(os.path.split(_
def make_tree(file_name):
"""Loads reStructuredText, outputs an lxml tree"""
- rst = resource_string(__name__, os.path.join("test_data", file_name))
+ rst = open(os.path.join(os.path.dirname(__file__), "test_data", file_name)).read()
xml, deps = rst2xml(rst)
return SlideMaker(etree.fromstring(xml)).walk()
Index: hovercraft/tests/test_parse.py
===================================================================
--- hovercraft.orig/tests/test_parse.py
+++ hovercraft/tests/test_parse.py
@@ -1,5 +1,5 @@
import unittest
-from pkg_resources import resource_string
+import os
from lxml import etree
from hovercraft.parse import SlideMaker, rst2xml
@@ -7,7 +7,7 @@ from hovercraft.parse import SlideMaker,
def make_tree(file_name):
"""Loads reStructuredText, outputs an lxml tree"""
- rst = resource_string(__name__, file_name)
+ rst = open(os.path.join(os.path.dirname(__file__), file_name)).read()
xml, dependencies = rst2xml(rst)
return etree.fromstring(xml)
@@ -60,7 +60,7 @@ class SlideMakerTests(unittest.TestCase)
b"<paragraph>There should also be possible to have\n"
b"preformatted text for code.</paragraph><literal_block "
b'classes="code python" xml:space="preserve"><inline classes="k">'
- b'def</inline> <inline classes="nf">foo</inline><inline '
+ b'def</inline><inline classes="w"> </inline><inline classes="nf">foo</inline><inline '
b'classes="p">(</inline><inline classes="n">bar</inline><inline '
b'classes="p">):</inline><inline classes="w">\n</inline> <inline classes="c1"># Comment'
b'</inline><inline classes="w">\n</inline> <inline classes="n">a</inline> <inline '
|
