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
|
Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/web/__init__.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/pattern/web/__init__.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/web/__init__.py
@@ -31,13 +31,12 @@ import itertools
import new
import api
-import feed
import oauth
-import json
+import simplejson as json
import locale
-from feed import feedparser
-from soup import BeautifulSoup
+import feedparser
+import BeautifulSoup
try:
# Import persistent Cache.
Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/setup.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/setup.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/setup.py
@@ -57,13 +57,10 @@ setup(
"pattern.web",
"pattern.web.cache",
"pattern.web.docx",
- "pattern.web.feed",
"pattern.web.imap",
- "pattern.web.json",
"pattern.web.locale",
"pattern.web.oauth",
"pattern.web.pdf",
- "pattern.web.soup",
"pattern.db",
"pattern.text",
"pattern.text.de",
@@ -84,11 +81,8 @@ setup(
"pattern" : ["*.js"],
"pattern.web.cache" : ["tmp/*"],
"pattern.web.docx" : ["*"],
- "pattern.web.feed" : ["*"],
- "pattern.web.json" : ["*"],
"pattern.web.locale" : ["*"],
"pattern.web.pdf" : ["*.txt", "cmap/*"],
- "pattern.web.soup" : ["*"],
"pattern.text.de" : ["*.txt", "*.xml"],
"pattern.text.en" : ["*.txt", "*.xml", "*.slp"],
"pattern.text.en.wordlist": ["*.txt"],
Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/__init__.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/pattern/vector/svm/__init__.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/__init__.py
@@ -1,7 +1,7 @@
LIBSVM = LIBLINEAR = True
try:
- import libsvm
+ from svm import libsvm
import libsvmutil
except ImportError as e:
LIBSVM = False
Index: pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/libsvmutil.py
===================================================================
--- pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb.orig/pattern/vector/svm/libsvmutil.py
+++ pattern-820cccf33c6ac4a4f1564a273137171cfa6ab7cb/pattern/vector/svm/libsvmutil.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-from libsvm import *
+from svm import *
import os, sys
sys.path = [os.path.dirname(os.path.abspath(__file__))] + sys.path
|