Skip to content

Commit

Permalink
Fixed a build error due to install failing to copy directories.
Browse files Browse the repository at this point in the history
Ignore-this: 3fcd2e671508c801657b8e4737aff720

darcs-hash:20091130111637-f1522-c2f56588f2b6271bac2bfad8a4921a7934f6eda8.gz
  • Loading branch information
scudette committed Nov 30, 2009
1 parent b78ac6b commit 32f4235
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ ACLOCAL_AMFLAGS = -I config

SUBDIRS = src debian

my_images = $(shell find images -not -name .\*)
my_data = $(shell find data -not -name .\*)
my_utilities = $(shell find utilities -not -name .\*)
my_examples = $(shell find examples -not -name .\*)
my_images = $(shell find images -type f -not -name .\*)
my_data = $(shell find data -type f -not -name .\*)
my_utilities = $(shell find utilities -type f -not -name .\*)
my_examples = $(shell find examples -type f -not -name .\*)
bin_SCRIPTS = pyflag pyflash pyflag_launch src/pyflag/conf.py
pkgdata_DATA = $(my_data) \
data/magic.mgc data/magic.mime.mgc \
Expand Down
23 changes: 23 additions & 0 deletions src/FileFormats/HTML.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,26 @@ def innerHTML(self):

return result

def to_unicode(self, code):
child_result = ''
for c in self.children:
if type(c)==str:
child_result += c.encode(code)
else:
child_result += c.to_unicode(code)

attributes = "".join([expand(" %s='%s'",(k,iri_to_uri(v))) for k,v \
in self.attributes.items() if v != None ])

if self.type == 'selfclose':
result = expand("<%s%s/>", (self.name, attributes))
else:
result = expand("<%s%s>%s</%s>", (self.name.encode("utf8"), attributes,
child_result, self.name))

result = result.encode("latin1")
return result

def add_child(self, child):
## Try to augment CDATAs together for efficiency:
try:
Expand Down Expand Up @@ -152,6 +172,9 @@ def search(self, name):
## Return ourselves first:
if self.name == name:
yield self

elif re.search(name, self.name):
yield self

for c in self.children:
try:
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SUBDIRS = lib mailtools indextools_ng network filesystems include pyflag mmedia distorm regtools

my_javascript = $(shell find javascript -not -name .\*)
my_javascript = $(shell find javascript -type f -not -name .\*)
nobase_pkgdata_DATA = $(my_javascript)
EXTRA_DIST = $(nobase_pkgdata_DATA)

Expand Down

0 comments on commit 32f4235

Please sign in to comment.