Skip to content

Fix compatibility with six >= 1.11; Fix import ProtocolTreeNode #2379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noahfx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compatibility with six >= 1.11; Fix import ProtocolTreeNode #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e578d5
Fix compatibility with six >= 1.11
noahfx Jan 3, 2018
adde05c
Fix ProtocolTreeNode import at layers/protocol_media/picture.py
noahfx Jan 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import platform
import sys

deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six']

if sys.version_info < (2,7):
deps += ['importlib', "protobuf==3.4.0"]
Expand Down
1 change: 0 additions & 1 deletion yowsup/env/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ def __init__(cls, name, bases, dct):
super(YowsupEnvType, cls).__init__(name, bases, dct)

class YowsupEnv(with_metaclass(YowsupEnvType, object)):
__metaclass__ = YowsupEnvType
__ENVS = {}
__CURR = None

Expand Down
2 changes: 1 addition & 1 deletion yowsup/layers/protocol_media/picture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from yowsup.layers import YowLayer
from yowsup import ProtocolTreeNode
from yowsup.structs import ProtocolTreeNode
from .mediadownloader import MediaDownloader
import shutil, os, logging
logger = logging.getLogger(__name__)
Expand Down