Merge lp:~jelmer/qbrz/relative into lp:qbrz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Robert Ladyman
Approved revision: 1633
Merged at revision: 1642
Proposed branch: lp:~jelmer/qbrz/relative
Merge into: lp:qbrz
Diff against target: 12 lines (+1/-1)
1 file modified
setup.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/qbrz/relative
Reviewer Review Type Date Requested Status
Robert Ladyman Approve
Review via email: mp+395964@code.launchpad.net

Commit message

Handle relative imports when __name__ is not set.

Description of the change

Handle relative imports when __name__ is not set.

Without this, invoking setup.py from distutils.core.run_setup fails with
KeyError.

To post a comment you must log in.
Revision history for this message
Robert Ladyman (saccadic-masking) wrote :

Added. Note I have reverted to 1632 (where patch applied) as my 1633/4 broke a lot of things.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2021-01-06 13:32:27 +0000
3+++ setup.py 2021-01-08 01:04:04 +0000
4@@ -12,7 +12,7 @@
5
6 # RJL Patched out temporarily
7 try:
8- from .extras import cmdclass
9+ from extras import cmdclass
10 except (ImportError, SystemError):
11 cmdclass = {}
12 except ValueError:

Subscribers

People subscribed via source and target branches

to all changes: