diff options
author | mrDoctorWho <mrdoctorwho@gmail.com> | 2013-12-20 19:27:46 +0400 |
---|---|---|
committer | mrDoctorWho <mrdoctorwho@gmail.com> | 2013-12-20 19:27:46 +0400 |
commit | 3ba2132c32e55efb37d134039b6cc3cf2eb4d4d2 (patch) | |
tree | 4c87840af26a4db3e91fb2e581dd37e10c4a626f /library | |
parent | 148484e92d72c578f06b92b6e843ef980bfa56d6 (diff) |
Added: function that will automatically add your transport to the public list (can be disabled by allowBePublic = False in Config.txt)
Changed vkApi.py. A parts of code and cleanup by @ernado
Removed new threads for earch user that used for keep him online
Removed unused imports, simple code cleanup, xmpppy updates, itypes update
Diffstat (limited to 'library')
-rw-r--r--[-rwxr-xr-x] | library/itypes.py | 14 | ||||
-rw-r--r-- | library/vkApi.py | 186 | ||||
-rw-r--r-- | library/xmpp/LICENSE | 675 | ||||
-rw-r--r-- | library/xmpp/auth.py | 2 | ||||
-rw-r--r-- | library/xmpp/client.py | 4 | ||||
-rw-r--r-- | library/xmpp/commands.py | 16 | ||||
-rw-r--r-- | library/xmpp/debug.py | 12 | ||||
-rw-r--r-- | library/xmpp/dispatcher.py | 2 | ||||
-rw-r--r-- | library/xmpp/features.py | 4 | ||||
-rw-r--r-- | library/xmpp/filetransfer.py | 4 | ||||
-rw-r--r-- | library/xmpp/protocol.py | 6 | ||||
-rw-r--r-- | library/xmpp/simplexml.py | 14 | ||||
-rw-r--r-- | library/xmpp/transports.py | 18 |
13 files changed, 817 insertions, 140 deletions
diff --git a/library/itypes.py b/library/itypes.py index b8375e3..c0428c4 100755..100644 --- a/library/itypes.py +++ b/library/itypes.py @@ -21,7 +21,7 @@ else: __all__ = [ "Number", "Database" - ] +] __version__ = "0.8" @@ -50,17 +50,17 @@ class Number(object): __oct__ = lambda self: self.number.__oct__() - __eq__ = lambda self: self.number.__eq__() + __eq__ = lambda self, number: self.number == number - __ne__ = lambda self: self.number.__ne__() + __ne__ = lambda self, number: self.number != number - __gt__ = lambda self: self.number.__gt__() + __gt__ = lambda self, number: self.number > number - __lt__ = lambda self: self.number.__lt__() + __lt__ = lambda self, number: self.number < number - __ge__ = lambda self: self.number.__ge__() + __ge__ = lambda self, number: self.number >= number - __le__ = lambda self: self.number.__le__() + __le__ = lambda self, number: self.number <= number class LazyDescriptor(object): # not really lazy, but setter is not needed diff --git a/library/vkApi.py b/library/vkApi.py index e680a4b..401164e 100644 --- a/library/vkApi.py +++ b/library/vkApi.py @@ -3,21 +3,39 @@ # Warning: Code in this module is ugly, # but we can't do better. -import re, time -import ssl, urllib, urllib2, cookielib, webtools +import time, ssl, urllib, urllib2, cookielib +import logging, json, webtools -try: - import simplejson as json # We hope you're read wiki. -except ImportError: - import json -class RequestProcessor(object): +logger = logging.getLogger("vk4xmpp") + + +def attemptTo(func): + """ + Tries to execute function for 3 times, silences (urllib2.URLError, ssl.SSLError) + """ + def wrapper(*args, **kwargs): + maxRetries = 3 + retries = 0 + while maxRetries > retries: + try: + return func(*args, **kwargs) + except (urllib2.URLError, ssl.SSLError) as e: + logger.debug("Error %s occured on safeExecute" % e) + retries += 1 + return {} + return wrapper + +class RequestProcessor(object): + """ + Processing base requests: POST (multipart/form-data) and GET. + """ headers = { "User-agent": "Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:21.0)"\ - " Gecko/20130309 Firefox/21.0", - "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", - "Accept-Language": "ru-RU, utf-8" - } + " Gecko/20130309 Firefox/21.0", + "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", + "Accept-Language": "ru-RU, utf-8" + } def __init__(self): self.cookieJar = cookielib.CookieJar() self.cookieProcessor = urllib2.HTTPCookieProcessor(self.cookieJar) @@ -28,58 +46,36 @@ class RequestProcessor(object): if cookie.name == name: return cookie.value - def request(self, url, data = None, headers = {}): - if not headers: - headers = self.headers + def request(self, url, data = None, headers = None): + headers = headers or self.headers if data: data = urllib.urlencode(data) request = urllib2.Request(url, data, headers) return request def open(self, request, timeout = 3): - response = self.safeExecution(self.Opener.open, (request, None, timeout)) - return response - - def safeExecution(self, func, args = (), retryCount = 0): - try: - if retryCount > 5: ## We're hope that it will be never called - raise RuntimeError - result = func(*args) - except (urllib2.URLError, ssl.SSLError): - retryCount += 1 - result = self.safeExecution(func, args, retryCount) - except RuntimeError: ## We're so sad :( for this fact, really, very sad - result = {} - return result - - def post(self, url, data = {}, retryCount = 0): - body = {} + return attemptTo(self.Opener.open)(request, None, timeout) + + @attemptTo + def post(self, url, data = None): + data = data or {} request = self.request(url, data) - response = self.safeExecution(self.open, (request,)) - try: - if response: - body = response.read() ## we can't use safeExecution because .read() method can be used once - if retryCount > 2: - raise RuntimeError - except (urllib2.URLError, ssl.SSLError): - retryCount += 1 - return self.post(url, data, retryCount) - except RuntimeError: - body = {} + response = self.open(request) + body = response.read() return (body, response) def get(self, url, data = {}): if data: - url = url + "/?%s" % urllib.urlencode(data) + url += "/?%s" % urllib.urlencode(data) request = self.request(url) - response = self.safeExecution(self.open, (request,)) # Why again? + response = response = attemptTo(self.open)(request) body = response.read() - return (body, response) + return (body, response) # I'd like brackets. Why not? class APIBinding: - def __init__(self, number, password = None, token = None, app_id = 3789129, - scope = 69634): + def __init__(self, number, password = None, token = None, app_id = 3789129, + scope = 69634): self.password = password self.number = number @@ -97,18 +93,17 @@ class APIBinding: def loginByPassword(self): url = "https://login.vk.com/" - values = { "act": "login", - "utf8": "1", # check if it needed - "email": self.number, - "pass": self.password - } + values = {"act": "login", + "utf8": "1", # check if it needed + "email": self.number, + "pass": self.password + } - post = self.RIP.post(url, values) - body, response = post - RemixSID = self.RIP.getCookie("remixsid") + body, response = self.RIP.post(url, values) + remixSID = self.RIP.getCookie("remixsid") - if RemixSID: - self.sid = RemixSID + if remixSID: + self.sid = remixSID elif "sid=" in response.url: raise AuthError("Captcha!") @@ -116,23 +111,24 @@ class APIBinding: raise AuthError("Invalid password") if "security_check" in response.url: + # This code should be rewritten! Users from another countries can have problems because of it! Hash = webtools.regexp(r"security_check.*?hash: '(.*?)'\};", body)[0] code = self.number[2:-2] if len(self.number) == 12: if not self.number.startswith("+"): - code = self.number[3:-2] # may be +375123456789 - + code = self.number[3:-2] # may be +375123456789 + elif len(self.number) == 13: # so we need 1234567 if self.number.startswith("+"): code = self.number[4:-2] - values = { "act": "security_check", - "al": "1", - "al_page": "3", - "code": code, - "hash": Hash, - "to": "" - } + values = {"act": "security_check", + "al": "1", + "al_page": "3", + "code": code, + "hash": Hash, + "to": "" + } post = self.RIP.post("https://vk.com/login.php", values) body, response = post if response and not body.split("<!>")[4] == "4": @@ -150,31 +146,30 @@ class APIBinding: def confirmThisApp(self): url = "https://oauth.vk.com/authorize" - values = { "display": "mobile", - "scope": self.scope, - "client_id": self.app_id, - "response_type": "token", - "redirect_uri": "https://oauth.vk.com/blank.html" - } + values = {"display": "mobile", + "scope": self.scope, + "client_id": self.app_id, + "response_type": "token", + "redirect_uri": "https://oauth.vk.com/blank.html" + } token = None - get = self.RIP.get(url, values) - body, response = get + body, response = self.RIP.get(url, values) if response: if "access_token" in response.url: token = response.url.split("=")[1].split("&")[0] else: - PostTarget = webtools.getTagArg("form method=\"post\"", "action", body, "form") - if PostTarget: - post = self.RIP.post(PostTarget) # why no data? - body, response = post + postTarget = webtools.getTagArg("form method=\"post\"", "action", body, "form") + if postTarget: + body, response = self.RIP.post(PostTarget) token = response.url.split("=")[1].split("&")[0] else: raise AuthError("Couldn't execute confirmThisApp()!") self.token = token - def method(self, method, values = {}): + def method(self, method, values = None): + values = values or {} url = "https://api.vk.com/method/%s" % method values["access_token"] = self.token values["v"] = "3.0" @@ -187,25 +182,23 @@ class APIBinding: self.last.append(time.time()) if len(self.last) > 2: if (self.last.pop() - self.last.pop(0)) < 1.1: - time.sleep(0.3) # warn: it was 0.4 // does it matter? + time.sleep(0.3) # warn: it was 0.4 // does it matter? - post = self.RIP.post(url, values) - - body, response = post + body, response = self.RIP.post(url, values) if body: body = json.loads(body) # Debug: -## if method == "users.get":##("messages.get", "messages.send"): -## print "method %s with values %s" % (method, str(values)) -## print "response for method %s: %s" % (method, str(body)) - if body.has_key("response"): +# if method in ("users.get", "messages.get", "messages.send"): +# print "method %s with values %s" % (method, str(values)) +# print "response for method %s: %s" % (method, str(body)) + if "response" in body: return body["response"] - elif body.has_key("error"): + elif "error" in body: error = body["error"] eCode = error["error_code"] ## TODO: Check this code - if eCode == 5: # invalid token + if eCode == 5: # invalid token self.attempts += 1 if self.attempts < 3: retry = self.retry() @@ -214,36 +207,41 @@ class APIBinding: return retry else: raise TokenError(error["error_msg"]) - if eCode == 6: # too fast + if eCode == 6: # too fast time.sleep(3) return self.method(method, values) - elif eCode == 5: # auth failed + elif eCode == 5: # auth failed raise VkApiError("Logged out") if eCode == 7: raise NotAllowed elif eCode == 9: return {} - if eCode == 14: # captcha - if error.has_key("captcha_sid"): + if eCode == 14: # captcha + if "captcha_sid" in error: self.captcha = {"sid": error["captcha_sid"], "img": error["captcha_img"]} raise CaptchaNeeded raise VkApiError(body["error"]) def retry(self): - if self.lastMethod: + if self.lastMethod: return self.method(*self.lastMethod) + class VkApiError(Exception): pass + class AuthError(VkApiError): pass + class CaptchaNeeded(VkApiError): pass + class TokenError(VkApiError): pass + class NotAllowed(VkApiError): pass diff --git a/library/xmpp/LICENSE b/library/xmpp/LICENSE new file mode 100644 index 0000000..ecbfcd1 --- /dev/null +++ b/library/xmpp/LICENSE @@ -0,0 +1,675 @@ +
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+ software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+ to take away your freedom to share and change the works. By contrast,
+ the GNU General Public License is intended to guarantee your freedom to
+ share and change all versions of a program--to make sure it remains free
+ software for all its users. We, the Free Software Foundation, use the
+ GNU General Public License for most of our software; it applies also to
+ any other work released this way by its authors. You can apply it to
+ your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+ price. Our General Public Licenses are designed to make sure that you
+ have the freedom to distribute copies of free software (and charge for
+ them if you wish), that you receive source code or can get it if you
+ want it, that you can change the software or use pieces of it in new
+ free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+ these rights or asking you to surrender the rights. Therefore, you have
+ certain responsibilities if you distribute copies of the software, or if
+ you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+ gratis or for a fee, you must pass on to the recipients the same
+ freedoms that you received. You must make sure that they, too, receive
+ or can get the source code. And you must show them these terms so they
+ know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+ (1) assert copyright on the software, and (2) offer you this License
+ giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+ that there is no warranty for this free software. For both users' and
+ authors' sake, the GPL requires that modified versions be marked as
+ changed, so that their problems will not be attributed erroneously to
+ authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+ modified versions of the software inside them, although the manufacturer
+ can do so. This is fundamentally incompatible with the aim of
+ protecting users' freedom to change the software. The systematic
+ pattern of such abuse occurs in the area of products for individuals to
+ use, which is precisely where it is most unacceptable. Therefore, we
+ have designed this version of the GPL to prohibit the practice for those
+ products. If such problems arise substantially in other domains, we
+ stand ready to extend this provision to those domains in future versions
+ of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+ States should not allow patents to restrict development and use of
+ software on general-purpose computers, but in those that do, we wish to
+ avoid the special danger that patents applied to a free program could
+ make it effectively proprietary. To prevent this, the GPL assures that
+ patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+ modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+ works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+ License. Each licensee is addressed as "you". "Licensees" and
+ "recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+ in a fashion requiring copyright permission, other than the making of an
+ exact copy. The resulting work is called a "modified version" of the
+ earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+ on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+ permission, would make you directly or secondarily liable for
+ infringement under applicable copyright law, except executing it on a
+ computer or modifying a private copy. Propagation includes copying,
+ distribution (with or without modification), making available to the
+ public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+ parties to make or receive copies. Mere interaction with a user through
+ a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+ to the extent that it includes a convenient and prominently visible
+ feature that (1) displays an appropriate copyright notice, and (2)
+ tells the user that there is no warranty for the work (except to the
+ extent that warranties are provided), that licensees may convey the
+ work under this License, and how to view a copy of this License. If
+ the interface presents a list of user commands or options, such as a
+ menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+ for making modifications to it. "Object code" means any non-source
+ form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+ standard defined by a recognized standards body, or, in the case of
+ interfaces specified for a particular programming language, one that
+ is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+ than the work as a whole, that (a) is included in the normal form of
+ packaging a Major Component, but which is not part of that Major
+ Component, and (b) serves only to enable use of the work with that
+ Major Component, or to implement a Standard Interface for which an
+ implementation is available to the public in source code form. A
+ "Major Component", in this context, means a major essential component
+ (kernel, window system, and so on) of the specific operating system
+ (if any) on which the executable work runs, or a compiler used to
+ produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+ the source code needed to generate, install, and (for an executable
+ work) run the object code and to modify the work, including scripts to
+ control those activities. However, it does not include the work's
+ System Libraries, or general-purpose tools or generally available free
+ programs which are used unmodified in performing those activities but
+ which are not part of the work. For example, Corresponding Source
+ includes interface definition files associated with source files for
+ the work, and the source code for shared libraries and dynamically
+ linked subprograms that the work is specifically designed to require,
+ such as by intimate data communication or control flow between those
+ subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+ can regenerate automatically from other parts of the Corresponding
+ Source.
+
+ The Corresponding Source for a work in source code form is that
+ same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+ copyright on the Program, and are irrevocable provided the stated
+ conditions are met. This License explicitly affirms your unlimited
+ permission to run the unmodified Program. The output from running a
+ covered work is covered by this License only if the output, given its
+ content, constitutes a covered work. This License acknowledges your
+ rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+ convey, without conditions so long as your license otherwise remains
+ in force. You may convey covered works to others for the sole purpose
+ of having them make modifications exclusively for you, or provide you
+ with facilities for running those works, provided that you comply with
+ the terms of this License in conveying all material for which you do
+ not control copyright. Those thus making or running the covered works
+ for you must do so exclusively on your behalf, under your direction
+ and control, on terms that prohibit them from making any copies of
+ your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+ the conditions stated below. Sublicensing is not allowed; section 10
+ makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+ measure under any applicable law fulfilling obligations under article
+ 11 of the WIPO copyright treaty adopted on 20 December 1996, or
+ similar laws prohibiting or restricting circumvention of such
+ measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+ circumvention of technological measures to the extent such circumvention
+ is effected by exercising rights under this License with respect to
+ the covered work, and you disclaim any intention to limit operation or
+ modification of the work as a means of enforcing, against the work's
+ users, your or third parties' legal rights to forbid circumvention of
+ technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+ receive it, in any medium, provided that you conspicuously and
+ appropriately publish on each copy an appropriate copyright notice;
+ keep intact all notices stating that this License and any
+ non-permissive terms added in accord with section 7 apply to the code;
+ keep intact all notices of the absence of any warranty; and give all
+ recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+ and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+ produce it from the Program, in the form of source code under the
+ terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+ works, which are not by their nature extensions of the covered work,
+ and which are not combined with it such as to form a larger program,
+ in or on a volume of a storage or distribution medium, is called an
+ "aggregate" if the compilation and its resulting copyright are not
+ used to limit the access or legal rights of the compilation's users
+ beyond what the individual works permit. Inclusion of a covered work
+ in an aggregate does not cause this License to apply to the other
+ parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+ of sections 4 and 5, provided that you also convey the
+ machine-readable Corresponding Source under the terms of this License,
+ in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+ from the Corresponding Source as a System Library, need not be
+ included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+ tangible personal property which is normally used for personal, family,
+ or household purposes, or (2) anything designed or sold for incorporation
+ into a dwelling. In determining whether a product is a consumer product,
+ doubtful cases shall be resolved in favor of coverage. For a particular
+ product received by a particular user, "normally used" refers to a
+ typical or common use of that class of product, regardless of the status
+ of the particular user or of the way in which the particular user
+ actually uses, or expects or is expected to use, the product. A product
+ is a consumer product regardless of whether the product has substantial
+ commercial, industrial or non-consumer uses, unless such uses represent
+ the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+ procedures, authorization keys, or other information required to install
+ and execute modified versions of a covered work in that User Product from
+ a modified version of its Corresponding Source. The information must
+ suffice to ensure that the continued functioning of the modified object
+ code is in no case prevented or interfered with solely because
+ modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+ specifically for use in, a User Product, and the conveying occurs as
+ part of a transaction in which the right of possession and use of the
+ User Product is transferred to the recipient in perpetuity or for a
+ fixed term (regardless of how the transaction is characterized), the
+ Corresponding Source conveyed under this section must be accompanied
+ by the Installation Information. But this requirement does not apply
+ if neither you nor any third party retains the ability to install
+ modified object code on the User Product (for example, the work has
+ been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+ requirement to continue to provide support service, warranty, or updates
+ for a work that has been modified or installed by the recipient, or for
+ the User Product in which it has been modified or installed. Access to a
+ network may be denied when the modification itself materially and
+ adversely affects the operation of the network or violates the rules and
+ protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+ in accord with this section must be in a format that is publicly
+ documented (and with an implementation available to the public in
+ source code form), and must require no special password or key for
+ unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+ License by making exceptions from one or more of its conditions.
+ Additional permissions that are applicable to the entire Program shall
+ be treated as though they were included in this License, to the extent
+ that they are valid under applicable law. If additional permissions
+ apply only to part of the Program, that part may be used separately
+ under those permissions, but the entire Program remains governed by
+ this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+ remove any additional permissions from that copy, or from any part of
+ it. (Additional permissions may be written to require their own
+ removal in certain cases when you modify the work.) You may place
+ additional permissions on material, added by you to a covered work,
+ for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+ add to a covered work, you may (if authorized by the copyright holders of
+ that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+ restrictions" within the meaning of section 10. If the Program as you
+ received it, or any part of it, contains a notice stating that it is
+ governed by this License along with a term that is a further
+ restriction, you may remove that term. If a license document contains
+ a further restriction but permits relicensing or conveying under this
+ License, you may add to a covered work material governed by the terms
+ of that license document, provided that the further restriction does
+ not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+ must place, in the relevant source files, a statement of the
+ additional terms that apply to those files, or a notice indicating
+ where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+ form of a separately written license, or stated as exceptions;
+ the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+ provided under this License. Any attempt otherwise to propagate or
+ modify it is void, and will automatically terminate your rights under
+ this License (including any patent licenses granted under the third
+ paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+ license from a particular copyright holder is reinstated (a)
+ provisionally, unless and until the copyright holder explicitly and
+ finally terminates your license, and (b) permanently, if the copyright
+ holder fails to notify you of the violation by some reasonable means
+ prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+ reinstated permanently if the copyright holder notifies you of the
+ violation by some reasonable means, this is the first time you have
+ received notice of violation of this License (for any work) from that
+ copyright holder, and you cure the violation prior to 30 days after
+ your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+ licenses of parties who have received copies or rights from you under
+ this License. If your rights have been terminated and not permanently
+ reinstated, you do not qualify to receive new licenses for the same
+ material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+ run a copy of the Program. Ancillary propagation of a covered work
+ occurring solely as a consequence of using peer-to-peer transmission
+ to receive a copy likewise does not require acceptance. However,
+ nothing other than this License grants you permission to propagate or
+ modify any covered work. These actions infringe copyright if you do
+ not accept this License. Therefore, by modifying or propagating a
+ covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+ receives a license from the original licensors, to run, modify and
+ propagate that work, subject to this License. You are not responsible
+ for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+ organization, or substantially all assets of one, or subdividing an
+ organization, or merging organizations. If propagation of a covered
+ work results from an entity transaction, each party to that
+ transaction who receives a copy of the work also receives whatever
+ licenses to the work the party's predecessor in interest had or could
+ give under the previous paragraph, plus a right to possession of the
+ Corresponding Source of the work from the predecessor in interest, if
+ the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+ rights granted or affirmed under this License. For example, you may
+ not impose a license fee, royalty, or other charge for exercise of
+ rights granted under this License, and you may not initiate litigation
+ (including a cross-claim or counterclaim in a lawsuit) alleging that
+ any patent claim is infringed by making, using, selling, offering for
+ sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+ License of the Program or a work on which the Program is based. The
+ work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+ owned or controlled by the contributor, whether already acquired or
+ hereafter acquired, that would be infringed by some manner, permitted
+ by this License, of making, using, or selling its contributor version,
+ but do not include claims that would be infringed only as a
+ consequence of further modification of the contributor version. For
+ purposes of this definition, "control" includes the right to grant
+ patent sublicenses in a manner consistent with the requirements of
+ this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+ patent license under the contributor's essential patent claims, to
+ make, use, sell, offer for sale, import and otherwise run, modify and
+ propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+ agreement or commitment, however denominated, not to enforce a patent
+ (such as an express permission to practice a patent or covenant not to
+ sue for patent infringement). To "grant" such a patent license to a
+ party means to make such an agreement or commitment not to enforce a
+ patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+ and the Corresponding Source of the work is not available for anyone
+ to copy, free of charge and under the terms of this License, through a
+ publicly available network server or other readily accessible means,
+ then you must either (1) cause the Corresponding Source to be so
+ available, or (2) arrange to deprive yourself of the benefit of the
+ patent license for this particular work, or (3) arrange, in a manner
+ consistent with the requirements of this License, to extend the patent
+ license to downstream recipients. "Knowingly relying" means you have
+ actual knowledge that, but for the patent license, your conveying the
+ covered work in a country, or your recipient's use of the covered work
+ in a country, would infringe one or more identifiable patents in that
+ country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+ arrangement, you convey, or propagate by procuring conveyance of, a
+ covered work, and grant a patent license to some of the parties
+ receiving the covered work authorizing them to use, propagate, modify
+ or convey a specific copy of the covered work, then the patent license
+ you grant is automatically extended to all recipients of the covered
+ work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+ the scope of its coverage, prohibits the exercise of, or is
+ conditioned on the non-exercise of one or more of the rights that are
+ specifically granted under this License. You may not convey a covered
+ work if you are a party to an arrangement with a third party that is
+ in the business of distributing software, under which you make payment
+ to the third party based on the extent of your activity of conveying
+ the work, and under which the third party grants, to any of the
+ parties who would receive the covered work from you, a discriminatory
+ patent license (a) in connection with copies of the covered work
+ conveyed by you (or copies made from those copies), or (b) primarily
+ for and in connection with specific products or compilations that
+ contain the covered work, unless you entered into that arrangement,
+ or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+ any implied license or other defenses to infringement that may
+ otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+ otherwise) that contradict the conditions of this License, they do not
+ excuse you from the conditions of this License. If you cannot convey a
+ covered work so as to satisfy simultaneously your obligations under this
+ License and any other pertinent obligations, then as a consequence you may
+ not convey it at all. For example, if you agree to terms that obligate you
+ to collect a royalty for further conveying from those to whom you convey
+ the Program, the only way you could satisfy both those terms and this
+ License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+ permission to link or combine any covered work with a work licensed
+ under version 3 of the GNU Affero General Public License into a single
+ combined work, and to convey the resulting work. The terms of this
+ License will continue to apply to the part which is the covered work,
+ but the special requirements of the GNU Affero General Public License,
+ section 13, concerning interaction through a network will apply to the
+ combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+ the GNU General Public License from time to time. Such new versions will
+ be similar in spirit to the present version, but may differ in detail to
+ address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+ Program specifies that a certain numbered version of the GNU General
+ Public License "or any later version" applies to it, you have the
+ option of following the terms and conditions either of that numbered
+ version or of any later version published by the Free Software
+ Foundation. If the Program does not specify a version number of the
+ GNU General Public License, you may choose any version ever published
+ by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+ versions of the GNU General Public License can be used, that proxy's
+ public statement of acceptance of a version permanently authorizes you
+ to choose that version for the Program.
+
+ Later license versions may give you additional or different
+ permissions. However, no additional obligations are imposed on any
+ author or copyright holder as a result of your choosing to follow a
+ later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+ APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+ HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+ OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+ IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+ THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+ GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+ USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+ DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+ EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+ above cannot be given local legal effect according to their terms,
+ reviewing courts shall apply local law that most closely approximates
+ an absolute waiver of all civil liability in connection with the
+ Program, unless a warranty or assumption of liability accompanies a
+ copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+ possible use to the public, the best way to achieve this is to make it
+ free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+ to attach them to the start of each source file to most effectively
+ state the exclusion of warranty; and each file should have at least
+ the "copyright" line and a pointer to where the full notice is found.
+
+ xmpp library for Python.
+ xmpppy Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+ notice like this when it starts in an interactive mode:
+
+ xmpppy Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+ The hypothetical commands `show w' and `show c' should show the appropriate
+ parts of the General Public License. Of course, your program's commands
+ might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+ if any, to sign a "copyright disclaimer" for the program, if necessary.
+ For more information on this, and how to apply and follow the GNU GPL, see
+ <http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+ into proprietary programs. If your program is a subroutine library, you
+ may consider it more useful to permit linking proprietary applications with
+ the library. If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License. But first, please read
+ <http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/library/xmpp/auth.py b/library/xmpp/auth.py index 95842f4..ca21835 100644 --- a/library/xmpp/auth.py +++ b/library/xmpp/auth.py @@ -207,7 +207,7 @@ class SASL(PlugIn): self.startsasl = "failure" try: reason = challenge.getChildren()[0] - except: + except Exception: reason = challenge self.DEBUG("Failed SASL authentification: %s" % reason, "error") raise NodeProcessed() diff --git a/library/xmpp/client.py b/library/xmpp/client.py index b1c090a..66806ea 100644 --- a/library/xmpp/client.py +++ b/library/xmpp/client.py @@ -126,7 +126,7 @@ class CommonClient: """ Default event handler. To be overriden. """ - print "Event: ", (eventName, args) + print("Event: %s-%s" % (eventName, args)) def isConnected(self): """ @@ -370,5 +370,5 @@ class Component(CommonClient): return "sasl" else: raise auth.NotAuthorized(self.SASL.startsasl) - except: + except Exception: self.DEBUG(self.DBG, "Failed to authenticate %s" % name, "error") diff --git a/library/xmpp/commands.py b/library/xmpp/commands.py index f38fc2f..9c75649 100644 --- a/library/xmpp/commands.py +++ b/library/xmpp/commands.py @@ -92,7 +92,7 @@ class Commands(PlugIn): jid = str(request.getTo()) try: node = request.getTagAttr("command", "node") - except: + except Exception: conn.send(Error(request, ERR_BAD_REQUEST)) raise NodeProcessed() if self._handlers.has_key(jid): @@ -268,11 +268,11 @@ class Command_Handler_Prototype(PlugIn): # New request or old? try: session = request.getTagAttr("command", "sessionid") - except: + except Exception: session = None try: action = request.getTagAttr("command", "action") - except: + except Exception: action = None if action == None: action = "execute" @@ -331,7 +331,7 @@ class TestCommand(Command_Handler_Prototype): # This is the only place this should be repeated as all other stages should have SessionIDs try: session = request.getTagAttr("command", "sessionid") - except: + except Exception: session = None if session == None: session = self.getSessionID() @@ -413,14 +413,14 @@ class TestCommand(Command_Handler_Prototype): def cmdThirdStage(self, conn, request): form = DataForm(node=request.getTag(name="command").getTag(name="x", namespace=NS_DATA)) try: - num = float(form.getField("radius").getValue()) - except: + numb = float(form.getField("radius").getValue()) + except Exception: self.cmdSecondStageReply(conn, request) from math import pi if self.sessions[request.getTagAttr("command", "sessionid")]["data"]["type"] == "circlearea": - result = (num ** 2) * pi + result = (numb ** 2) * pi else: - result = num * 2 * pi + result = numb * 2 * pi reply = request.buildReply("result") form = DataForm(typ="result", data=[DataField(desc="result", name="result", value=result)]) reply.addChild(name="command", diff --git a/library/xmpp/debug.py b/library/xmpp/debug.py index be208c1..e84b4c1 100644 --- a/library/xmpp/debug.py +++ b/library/xmpp/debug.py @@ -65,7 +65,7 @@ LINE_FEED = "\n" class Debug: - def __init__(self, active_flags=None, log_file=sys.stderr, prefix="DEBUG: ", sufix="\n", time_stamp=0, flag_show=None, validate_flags=1, welcome= -1): + def __init__(self, active_flags=None, log_file=sys.stderr, prefix="DEBUG: ", sufix="\n", time_stamp=0, flag_show=None, validate_flags=False, welcome=-1): self.debug_flags = [] if welcome == -1: if active_flags and len(active_flags): @@ -77,8 +77,8 @@ class Debug: if isinstance(log_file, str): try: self._fh = open(log_file, "w") - except: - print "ERROR: can open %s for writing." + except Exception: + print("ERROR: can open %s for writing." % log_file) sys.exit(0) else: # assume its a stream type object self._fh = log_file @@ -97,7 +97,7 @@ class Debug: caller = sys._getframe(1) # used to get name of caller try: mod_name = ":%s" % caller.f_locals["__name__"] - except: + except Exception: mod_name = "" self.show("Debug created for %s%s" % (caller.f_code.co_filename, mod_name)) self.show(" flags defined: %s" % ",".join(self.active)) @@ -160,7 +160,7 @@ class Debug: output = output[:-1] try: self._fh.write(output) - except: + except Exception: # unicode strikes again ;) s = u"" for i in xrange(len(output)): @@ -211,7 +211,7 @@ class Debug: # assume comma string try: flags = active_flags.split(",") - except: + except Exception: self.show("***") self.show("*** Invalid debug param given: %s" % active_flags) self.show("*** please correct your param!") diff --git a/library/xmpp/dispatcher.py b/library/xmpp/dispatcher.py index c364ba9..62151d3 100644 --- a/library/xmpp/dispatcher.py +++ b/library/xmpp/dispatcher.py @@ -392,7 +392,7 @@ class Dispatcher(PlugIn): handler["func"](session, stanza) except NodeProcessed: user = 0 - except: + except Exception: self._pendingExceptions.insert(0, sys.exc_info()) if user and self._defaultHandler: self._defaultHandler(session, stanza) diff --git a/library/xmpp/features.py b/library/xmpp/features.py index 99088f7..8dbcbc3 100644 --- a/library/xmpp/features.py +++ b/library/xmpp/features.py @@ -175,7 +175,7 @@ def getPrivacyLists(disp): dict["lists"].append(list.getAttr("name")) else: dict[list.getName()] = list.getAttr("name") - except: + except Exception: pass else: return dict @@ -189,7 +189,7 @@ def getPrivacyList(disp, listname): resp = disp.SendAndWaitForResponse(Iq("get", NS_PRIVACY, payload=[Node("list", {"name": listname})])) if isResultNode(resp): return resp.getQueryPayload()[0] - except: + except Exception: pass def setActivePrivacyList(disp, listname=None, typ="active"): diff --git a/library/xmpp/filetransfer.py b/library/xmpp/filetransfer.py index fc938ab..c6ecdd9 100644 --- a/library/xmpp/filetransfer.py +++ b/library/xmpp/filetransfer.py @@ -82,7 +82,7 @@ class IBB(PlugIn): self.DEBUG("StreamOpenHandler called sid->%s blocksize->%s" % (sid, blocksize), "info") try: blocksize = int(blocksize) - except: + except Exception: err = ERR_BAD_REQUEST if not sid or not blocksize: err = ERR_BAD_REQUEST @@ -153,7 +153,7 @@ class IBB(PlugIn): try: seq = int(seq) data = decodestring(data) - except: + except Exception: seq = data = "" err = None if not sid in self._streams.keys(): diff --git a/library/xmpp/protocol.py b/library/xmpp/protocol.py index e9927b3..f49dcba 100644 --- a/library/xmpp/protocol.py +++ b/library/xmpp/protocol.py @@ -523,7 +523,7 @@ class Protocol(Node): try: if not self.getTimestamp() or x.getAttr("stamp") < self.getTimestamp(): self.setTimestamp(x.getAttr("stamp")) - except: + except Exception: pass if timestamp is not None: self.setTimestamp(timestamp) # To auto-timestamp stanza just pass timestamp="" @@ -534,7 +534,7 @@ class Protocol(Node): """ try: to = self["to"] - except: + except Exception: to = None return to @@ -544,7 +544,7 @@ class Protocol(Node): """ try: frm = self["from"] - except: + except Exception: frm = None return frm diff --git a/library/xmpp/simplexml.py b/library/xmpp/simplexml.py index 19dcb29..a416d24 100644 --- a/library/xmpp/simplexml.py +++ b/library/xmpp/simplexml.py @@ -260,7 +260,7 @@ class Node(object): """ try: attr = self.attrs[key] - except: + except Exception: attr = None return attr @@ -321,7 +321,7 @@ class Node(object): """ try: attr = self.getTag(tag).attrs[attr] - except: + except Exception: attr = None return attr @@ -331,7 +331,7 @@ class Node(object): """ try: data = self.getTag(tag).getData() - except: + except Exception: data = None return data @@ -433,7 +433,7 @@ class Node(object): """ try: self.getTag(tag).attrs[attr] = val - except: + except Exception: self.addChild(tag, attrs={attr: val}) def setTagData(self, tag, val, attrs={}): @@ -443,7 +443,7 @@ class Node(object): """ try: self.getTag(tag, attrs).setData(ustr(val)) - except: + except Exception: self.addChild(tag, attrs, payload=[ustr(val)]) def has_attr(self, key): @@ -600,9 +600,9 @@ class NodeBuilder: ns = self._document_nsp.get(nsp, "http://www.gajim.org/xmlns/undeclared-root") try: self.stream_header_received(ns, name, attrs) - except ValueError as e: + except ValueError: self._document_attrs = None - raise ValueError(str(e)) + raise if not self.last_is_data and self._ptr.parent: self._ptr.parent.data.append("") self.last_is_data = 0 diff --git a/library/xmpp/transports.py b/library/xmpp/transports.py index 0a12a74..71e1fb3 100644 --- a/library/xmpp/transports.py +++ b/library/xmpp/transports.py @@ -147,9 +147,13 @@ class TCPsocket(PlugIn): self._sock.connect(server) self._send = self._sock.sendall self._recv = self._sock.recv - except socket.error, (errno, strerror): - self.DEBUG("Failed to connect to remote host %s: %s (%s)" % (repr(server), strerror, errno), "error") - except: + except socket.error as error: + try: + code, error = error + except Exception: + code = -1 + self.DEBUG("Failed to connect to remote host %s: %s (%s)" % (repr(server), error, code), "error") + except Exception: pass else: self.DEBUG("Successfully connected to remote host %s." % repr(server), "start") @@ -180,12 +184,12 @@ class TCPsocket(PlugIn): sys.exc_clear() self._owner.disconnected() raise IOError("Disconnected!") - except: + except Exception: data = "" while self.pending_data(0): try: add = self._recv(BUFLEN) - except: + except Exception: break if not add: break @@ -213,7 +217,7 @@ class TCPsocket(PlugIn): data = ustr(data).encode("utf-8") try: self._send(data) - except: + except Exception: self.DEBUG("Socket error while sending data.", "error") self._owner.disconnected() else: @@ -297,7 +301,7 @@ class HTTPPROXYsocket(TCPsocket): return None try: proto, code, desc = reply.split("\n")[0].split(" ", 2) - except: + except Exception: raise error("Invalid proxy reply") if code != "200": self.DEBUG("Invalid proxy reply: %s %s %s" % (proto, code, desc), "error") |