Skip to content

Solve the import issue in Python2.#14816

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
gal0is:gal0is-branch
Jun 17, 2019
Merged

Solve the import issue in Python2.#14816
opencv-pushbot merged 1 commit intoopencv:3.4from
gal0is:gal0is-branch

Conversation

@gal0is
Copy link
Copy Markdown
Contributor

@gal0is gal0is commented Jun 15, 2019

#resolves #14761

This pullrequest changes

Change import statement. Otherwise it can not find the target.

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 15, 2019

Thank you for contribution!

Details: https://www.python.org/dev/peps/pep-0328

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@gal0is gal0is changed the base branch from master to 3.4 June 15, 2019 20:54
@gal0is gal0is changed the base branch from 3.4 to master June 15, 2019 21:13
@gal0is gal0is changed the base branch from master to 3.4 June 15, 2019 22:12
@gal0is
Copy link
Copy Markdown
Contributor Author

gal0is commented Jun 15, 2019 •
edited
Loading

Did I do that right?
I'm new to this git usage.

alalek
alalek approved these changes Jun 17, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thank you 👍

@opencv-pushbot opencv-pushbot merged commit bb7dc5f into opencv:3.4 Jun 17, 2019
opencv-pushbot pushed a commit that referenced this pull request Jun 17, 2019
@alalek
Merge pull request #14816 from gal0is:gal0is-branch
264679a
@alalek alalek mentioned this pull request Jun 21, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

bug category: python bindings

Projects

None yet

Milestone

3.4.7

Development

Successfully merging this pull request may close these issues.

3 participants

@gal0is @alalek @opencv-pushbot