Merge lp:~edvm-j/lalita/bug_url_plugin into lp:lalita

[Emiliano Dalla Verde Marcozzi]

Arreglo el plugin de URL y manejamos mejor el tema del import magic

[Marcos Dione (mdione)]

the patch is a little dirty, specially where if changes the default server and where it changes the required beautifoulsoup version.

[Marcos Dione (mdione)]

i think I fixed everything. anyone cares to re-check?

Unmerged revisions

174. By Emiliano Dalla Verde Marcozzi on 2012-07-08

fix de bug en plugin url

173. By Emiliano Dalla Verde Marcozzi on 2012-07-08

link bug

=== modified file 'README.txt'
--- README.txt	2010-07-19 20:53:28 +0000
+++ README.txt	2012-07-08 22:56:19 +0000
@@ -19,7 +19,7 @@
 
 The project page is::
 
-	https://edge.launchpad.net/lalita
+	https://launchpad.net/lalita
 
 To run the bot, create a config file (you can use the sample lalita.cfg.sample)
 as a guideline, and run::

=== modified file 'lalita.cfg.sample'
--- lalita.cfg.sample	2011-04-11 02:05:31 +0000
+++ lalita.cfg.sample	2012-07-08 22:56:19 +0000
@@ -83,7 +83,7 @@
         ),
         'freenode': dict (
             encoding='utf8',
-            host='irc.freenode.net', port=6667,
+            host='ezequielchan', port=6667,
             nickname='lalita',
             channels= {
                 '#not-grulic': dict (plugins={

=== modified file 'lalita/plugins/url.py'
--- lalita/plugins/url.py	2011-03-01 21:53:42 +0000
+++ lalita/plugins/url.py	2012-07-08 22:56:19 +0000
@@ -6,23 +6,28 @@
 
 import os
 import re
-
-from twisted.web import client
-from twisted.internet import defer, reactor
-from twisted.python import failure
-
-from BeautifulSoup import BeautifulStoneSoup
-
-import magic
+import random
 import chardet
-
 import sqlite3
 import datetime
 
-import random
+import magic
+if not hasattr(magic, 'open'):
+    exc = "\n\tpython-magic wrapper version must be >= 5.05.\n"
+    exc += "\tif you have a version below 5.05 you will not\n"
+    exc += "\thave the 'open' method in magic module and i will fail.\n"
+    exc += "\tAt ubuntu and fedora, you can install python-magic packages"
+    raise ValueError(exc)
 
 from lalita import Plugin
 
+from twisted.web import client
+from twisted.internet import reactor
+from twisted.python import failure
+
+from BeautifulSoup import BeautifulStoneSoup
+
+
 class Url (Plugin):
     url_re= re.compile ('((https?|ftp)://[^ ]+)', re.IGNORECASE|re.DOTALL)
     title_re= re.compile (
@@ -44,6 +49,8 @@
         self.config.update (config)
         self.logger.debug (self.config)
         self.titleFound= False
+
+
         self.magic= magic.open (magic.MAGIC_MIME)
         self.magic.load ()
 
@@ -179,7 +186,7 @@
             self.say(channel,
                      u"%s: necesito un ID y el nuevo título para poder renombrar", user)
             return
-        
+
         try:
             url_id = int(what[0])
         except ValueError:
@@ -190,7 +197,7 @@
         self.cursor.execute('''select title, poster from url where id = ?''', (url_id, ))
 
         result= list (self.cursor.fetchone ())
-        
+
         if not result:
             self.say(channel,
                      '%s: 404 ID %s not found', user, url_id)

=== modified file 'setup.py'
--- setup.py	2010-11-18 21:20:21 +0000
+++ setup.py	2012-07-08 22:56:19 +0000
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
-from distutils.core import setup
+
+#from distutils.core import setup
+from setuptools import setup
+
 
 setup(
     # metadata
@@ -24,7 +27,7 @@
     ],
 
     # content
-    packages = ['lalita', 'lalita.core', 'lalita.core.tests',
+    packages = ['lalita', 'lalita.contrib', 'lalita.core', 'lalita.core.tests',
                 'lalita.core.tests.plugins', 'lalita.plugins',
                 'lalita.plugins.randomer_utils', 'lalita.plugins.tests'],
     package_data = {
@@ -35,9 +38,10 @@
     scripts = ['lalita/ircbot.py'],
 
     # dependencies
-    requires = [
-        'twisted',
-        'beautifulsoup >= 3.1',
+    install_requires = [
+        'Twisted',
+        'beautifulsoup',
         'chardet',
+        'pyOpenSSL',
     ],
 )