Skip to content

Commit 5a94148

Browse files
author
Trevor Martin
committed
git --diff format patch
1 parent 4dd8927 commit 5a94148

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

pythonforandroid/recipes/websocket-client/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33

44
class WebSocketClient(Recipe):
5-
65
url = 'https://pypi.python.org/packages/a7/2b/0039154583cb0489c8e18313aa91ccd140ada103289c5c5d31d80fd6d186/websocket_client-0.40.0.tar.gz'
76
version = '0.40.0'
87
md5sum = 'f1cf4cc7869ef97a98e5f4be25c30986'
98

109
patches = ['websocket.patch'] # Paths relative to the recipe dir
1110

12-
depends = ['kivy', 'python2', 'android', 'pyjnius', 'backports.ssl-match-hostname',
13-
'cryptography', 'pyasn1', 'ndg_httpsclient', 'pyopenssl']
11+
depends = ['kivy', 'python2', 'android', 'pyjnius',
12+
'cryptography', 'pyasn1', 'pyopenssl']
1413

1514
recipe = WebSocketClient()
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
--- a/websocket/_logging.py 2016-10-02 21:35:05.000000000 -0400
2-
+++ b/websocket/_logging.py 2017-04-13 21:17:34.539598154 -0400
3-
@@ -19,9 +19,10 @@
1+
diff --git a/websocket/_logging.py b/websocket/_logging.py
2+
index 8a5f4a5..cebc23b 100644
3+
--- a/websocket/_logging.py
4+
+++ b/websocket/_logging.py
5+
@@ -19,9 +19,8 @@ Copyright (C) 2010 Hiroki Ohtani(liris)
46
Boston, MA 02110-1335 USA
57

68
"""
79
-import logging
810
-
911
-_logger = logging.getLogger('websocket')
10-
+#import logging
1112
+from kivy.logger import Logger
12-
+#_logger = logging.getLogger('websocket')
1313
+_logger = Logger
1414
_traceEnabled = False
1515

1616
__all__ = ["enableTrace", "dump", "error", "debug", "trace",
17-
@@ -67,8 +68,9 @@
17+
@@ -67,8 +66,9 @@ def trace(msg):
1818

1919

2020
def isEnabledForError():
2121
- return _logger.isEnabledFor(logging.ERROR)
22-
-
23-
+# return _logger.isEnabledFor(logging.ERROR)
2422
+ return True
2523

24+
2625
def isEnabledForDebug():
2726
- return _logger.isEnabledFor(logging.DEBUG)
28-
+# return _logger.isEnabledFor(logging.DEBUG)
2927
+ return True
28+
+

0 commit comments

Comments
 (0)