Skip to content

long SMS decode and unbind handle#75

Open
ywshzh wants to merge 9 commits intopython-smpplib:masterfrom
ywshzh:master
Open

long SMS decode and unbind handle#75
ywshzh wants to merge 9 commits intopython-smpplib:masterfrom
ywshzh:master

Conversation

@ywshzh
Copy link

@ywshzh ywshzh commented Dec 19, 2018

  1. long SMS decode, deal UDHI indicator in esm_class(01xxxxxx)
  2. add unbind handle when unbind recv

1. long SMS decode, deal UDHI indicator in esm_class(01xxxxxx)
2. add  unbind handle when  unbind recv
@ywshzh
Copy link
Author

ywshzh commented Dec 19, 2018

I closed the last pr I submitted and downloaded the latest version to manually sync my code. But this automatic test tool still reports an error, I am not very clear about the meaning of this error.

@ywshzh
Copy link
Author

ywshzh commented Dec 19, 2018

This is my first time to submit pr on github, not very clear about the operation process, and my english is not very good, I am sorry!

Copy link
Collaborator

@eigenein eigenein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine @ywshzh, thanks for contribution!

As regarding the error, you need to add 'udhi_field' there:

valid_keys = ('type', 'size', 'min', 'max', 'len_field')

The error message says that the parameter is not allowed because it's not in that list.

return self.sequence_generator.next_sequence()

def connect(self):
def connect(self, timeout=5):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use the existing timeout parameter from __init__?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for correcting, I am sorry to have missed this place when manually merging the code, I have fixed the submission. Parameter timeout I also added it to the member variable

add udhi_field in Param
add timeout to members
ywshzh added 3 commits August 5, 2019 10:05
keep a newline in the end of the files, and use the const (SMPP_GSMFEAT_UDHI) below
use the const SMPP_GSMFEAT_UDHI
@code-of-kpp
Copy link
Member

Please, rebase
Otherwise looks OK

@code-of-kpp
Copy link
Member

ywshzh added 2 commits August 9, 2019 14:42
1. long SMS decode, deal UDHI indicator in esm_class(01xxxxxx)
2. add  unbind handle when  unbind recv
    1. long SMS decode, deal UDHI indicator in esm_class(01xxxxxx)
    2. add  unbind handle when  unbind recv
@ywshzh
Copy link
Author

ywshzh commented Aug 9, 2019

请参阅https://help.github.com/en/articles/about-git-rebase#rebasing-commits-against-a-branch

you want i combine multiple commits into one?is it okay now?
Sorry, the first time I use this command

@code-of-kpp
Copy link
Member

Ok, I'll try to provide instructions

you want i combine multiple commits into one?i

no, you need to git checkout master and git pull origin master where origin is this repository, not you fork.
after that, go back to you branch git checkout your_branch and run interactive rebase: git rebase -i master
You'll face conflicts (in smpplib/client.py) and you need to fix them using meld or similar tool.
Once conflicts fixed and rebase is finished, please do git push -f your_fork your_branch.

@fpalamour
Copy link
Contributor

fpalamour commented Feb 10, 2021

I needed that feature and even though the PR hasn't been merged, I was able to use your code @ywshzh and I wanted to thank you very much. It works like a charm. I skipped a migraine here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants