Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bortzmeyer/seenthis-python
Browse files Browse the repository at this point in the history
Conflicts:
	seenthis-post.py
  • Loading branch information
bortzmeyer committed Apr 25, 2012
2 parents 692aabc + 1d5a76b commit 3fe8cbe
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions FeedParserPlus.py
Expand Up @@ -11,6 +11,12 @@
print >>sys.stderr, "I need the module feedparser, see <http://www.feedparser.org/>"
sys.exit(1)

try:
from simpletal import simpleTAL, simpleTALES, simpleTALUtils
except ImportError:
print >>sys.stderr, "I need the module simpleTAL, see <http://www.owlfish.com/software/simpleTAL/>"
sys.exit(1)

mytemplate = """
<feed xmlns="http://www.w3.org/2005/Atom">
<title tal:condition="feed/title" tal:content="feed/title"/>
Expand Down
2 changes: 1 addition & 1 deletion seenthis-backup.py
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

import SeenThis

Expand Down
2 changes: 1 addition & 1 deletion seenthis-post.py
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

import SeenThis
import sys
Expand Down

0 comments on commit 3fe8cbe

Please sign in to comment.