summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/addon/IRCInterface.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-05-01 13:05:40 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-05-01 13:05:40 +0200
commit095ad393330d9ccb86adac4894fe3280caa44234 (patch)
treef03b4a5674b4f6e79706350e06543ba565effd85 /pyload/plugin/addon/IRCInterface.py
parentUse bitmath lib to formatSize (diff)
parentFix https://github.com/pyload/pyload/issues/1351 (diff)
downloadpyload-095ad393330d9ccb86adac4894fe3280caa44234.tar.xz
Merge branch 'stable' into 0.4.10
Conflicts: module/plugins/hoster/RehostTo.py module/plugins/hoster/XVideosCom.py module/plugins/hoster/ZeveraCom.py module/plugins/internal/CaptchaService.py pyload/plugin/account/FilefactoryCom.py pyload/plugin/account/OneFichierCom.py pyload/plugin/account/WebshareCz.py pyload/plugin/addon/AntiVirus.py pyload/plugin/addon/Checksum.py pyload/plugin/addon/ExtractArchive.py pyload/plugin/container/CCF.py pyload/plugin/crypter/Go4UpCom.py pyload/plugin/hook/BypassCaptcha.py pyload/plugin/hook/CaptchaBrotherhood.py pyload/plugin/hook/ExpertDecoders.py pyload/plugin/hook/ImageTyperz.py pyload/plugin/hook/XFileSharingPro.py pyload/plugin/hoster/Ftp.py pyload/plugin/hoster/GigapetaCom.py pyload/plugin/hoster/MegaRapidCz.py pyload/plugin/hoster/MegaRapidoNet.py pyload/plugin/hoster/MultishareCz.py pyload/plugin/hoster/NarodRu.py pyload/plugin/hoster/QuickshareCz.py pyload/plugin/hoster/RapidgatorNet.py pyload/plugin/hoster/RapiduNet.py pyload/plugin/hoster/UnibytesCom.py pyload/plugin/hoster/UploadingCom.py pyload/plugin/hoster/WrzucTo.py pyload/plugin/internal/BasePlugin.py pyload/plugin/internal/SimpleDereferer.py pyload/plugin/internal/SimpleHoster.py pyload/plugin/internal/XFSCrypter.py pyload/plugin/internal/XFSHoster.py
Diffstat (limited to 'pyload/plugin/addon/IRCInterface.py')
-rw-r--r--pyload/plugin/addon/IRCInterface.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py
index 07a07e381..051d30aa9 100644
--- a/pyload/plugin/addon/IRCInterface.py
+++ b/pyload/plugin/addon/IRCInterface.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
+import pycurl
import re
import socket
import ssl
import time
import traceback
-from pycurl import FORM_FILE
from select import select
from threading import Thread
@@ -74,7 +74,7 @@ class IRCInterface(Thread, Addon):
task.setWaiting(60)
html = getURL("http://www.freeimagehosting.net/upload.php",
- post={"attached": (FORM_FILE, task.captchaFile)}, multipart=True)
+ post={"attached": (pycurl.FORM_FILE, task.captchaFile)}, multipart=True)
url = re.search(r"\[img\]([^\[]+)\[/img\]\[/url\]", html).group(1)
self.response(_("New Captcha Request: %s") % url)