http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11550
Revision: 11550 Author: drtrigon Date: 2013-05-18 19:42:20 +0000 (Sat, 18 May 2013) Log Message: ----------- improvement; irclib now checked by externals also new feature; midi file support for categorization
Modified Paths: -------------- trunk/pywikipedia/articlenos.py trunk/pywikipedia/catimages.py trunk/pywikipedia/externals/__init__.py trunk/pywikipedia/subster.py
Modified: trunk/pywikipedia/articlenos.py =================================================================== --- trunk/pywikipedia/articlenos.py 2013-05-18 14:36:57 UTC (rev 11549) +++ trunk/pywikipedia/articlenos.py 2013-05-18 19:42:20 UTC (rev 11550) @@ -14,11 +14,14 @@ # License : LGPL __version__ = '$Id$'
+import re + +import wikipedia as pywikibot +import externals +externals.check_setup('irclib') from ircbot import SingleServerIRCBot from irclib import nm_to_n, nm_to_h, irc_lower, ip_numstr_to_quad from irclib import ip_quad_to_numstr -import wikipedia as pywikibot -import re
class ArtNoDisp(SingleServerIRCBot): def __init__(self, site, channel, nickname, server, port=6667):
Modified: trunk/pywikipedia/catimages.py =================================================================== --- trunk/pywikipedia/catimages.py 2013-05-18 14:36:57 UTC (rev 11549) +++ trunk/pywikipedia/catimages.py 2013-05-18 19:42:20 UTC (rev 11550) @@ -3410,7 +3410,7 @@ # self._detect_AudioFeatures_YAAFE()
# midi audio feature extraction -# self._detect_AudioFeatures_MUSIC21() + self._detect_AudioFeatures_MUSIC21()
def _existInformation(self, info, ignore = ['Properties', 'ColorAverage']): result = []
Modified: trunk/pywikipedia/externals/__init__.py =================================================================== --- trunk/pywikipedia/externals/__init__.py 2013-05-18 14:36:57 UTC (rev 11549) +++ trunk/pywikipedia/externals/__init__.py 2013-05-18 19:42:20 UTC (rev 11550) @@ -23,7 +23,7 @@ # supports: 0. svn:externals # 1. package management system (yum, apt-get, ...) # 2. download from url (or svn, git repo) -# 3. checkout from mercurial repo ('hg clone ...' since not url available) +# 3. checkout from mercurial repo ('hg clone ...' since url not available) # dependencies: (svn, python) # yum, apt-get or whatever your system uses # mercurial (hg) @@ -66,6 +66,10 @@ #$ diff -Nau TEST_BeautifulSoup.py BeautifulSoup.py > patch-BeautifulSoup 'patch': 'patch-BeautifulSoup',}, {}), # OK + 'irclib': ({'linux-fedora': ['python-irclib'], + 'linux-ubuntu': [''],}, + {}, # http://python-irclib.sourceforge.net/ + {}), # OK 'colormath': ({'linux-fedora': [], 'linux-ubuntu': ['python-colormath'],}, { 'url': 'https://github.com/gtaylor/python-colormath/archive/master.zip', @@ -125,11 +129,11 @@ {}), # OK # TODO: vvv (include) # 'TEST_slic': ({}, +# { 'url': 'http://ivrg.epfl.ch/files/content/sites/ivrg/files/supplementary_material/RK...', +# 'path': 'SLICSuperpixelsAndSupervoxelsCode/SLICSuperpixels',}),# OPEN +# 'TEST_slic': ({}, # { 'url': 'https://github.com/amueller/slic-python/archive/master.zip', # 'path': 'slic-python-master',}), # OPEN -# 'TEST_slic': ({}, -# { 'url': 'http://ivrg.epfl.ch/files/content/sites/ivrg/files/supplementary_material/RK...', -# 'path': 'SLICSuperpixelsAndSupervoxelsCode/SLICSuperpixels',}),# OPEN # (2 download sources to same dir, compilation) + patch (at least for '__init__.py') needed '_zbar': ({'linux-fedora': ['zbar'], 'linux-ubuntu': ['python-zbar'],}, @@ -149,7 +153,7 @@ # (complex compilation, dependent on '_bob') + patch (at least for '__init__.py') needed }
-modules_order = ['crontab', 'odf', 'openpyxl', 'BeautifulSoup.py', +modules_order = ['crontab', 'odf', 'openpyxl', 'BeautifulSoup.py', 'irclib', 'colormath', 'jseg', 'jseg/jpeg-6b', '_mlpy', '_music21', '_ocropus', 'opencv/haarcascades', 'pydmtx', 'py_w3c', '_zbar',]
Modified: trunk/pywikipedia/subster.py =================================================================== --- trunk/pywikipedia/subster.py 2013-05-18 14:36:57 UTC (rev 11549) +++ trunk/pywikipedia/subster.py 2013-05-18 19:42:20 UTC (rev 11550) @@ -82,7 +82,6 @@ externals.check_setup('crontab') # externals.check_setup('odf') # externals.check_setup('openpyxl') # -#externals.check_setup('BeautifulSoup.py')# import BeautifulSoup import openpyxl.reader.excel import crontab