[diffoscope] 03/03: Rename diffoscope.__main__ to diffoscope.main as its not a "real" magic name

Chris Lamb chris at chris-lamb.co.uk
Tue Aug 9 15:26:58 CEST 2016


This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository diffoscope.

commit 041ad950ce52cc9dae6b91e2cf72a6318fe734ab
Author: Chris Lamb <lamby at debian.org>
Date:   Tue Aug 9 14:25:47 2016 +0100

    Rename diffoscope.__main__ to diffoscope.main as its not a "real" magic name
---
 bin/diffoscope                      | 2 +-
 diffoscope/{__main__.py => main.py} | 0
 setup.py                            | 2 +-
 tests/test_main.py                  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/diffoscope b/bin/diffoscope
index 2422b70..5acdfdf 100755
--- a/bin/diffoscope
+++ b/bin/diffoscope
@@ -26,7 +26,7 @@ for root in ['.', '..']:
         sys.path = [root] + sys.path
         break
 
-from diffoscope.__main__ import main
+from diffoscope.main import main
 
 if __name__ == '__main__':
     main()
diff --git a/diffoscope/__main__.py b/diffoscope/main.py
similarity index 100%
rename from diffoscope/__main__.py
rename to diffoscope/main.py
diff --git a/setup.py b/setup.py
index 235389e..2444c4f 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(name='diffoscope',
       cmdclass = {'test': PyTest},
       entry_points={
           'console_scripts': [
-              'diffoscope=diffoscope.__main__:main'
+              'diffoscope=diffoscope.main:main'
               ],
           },
       install_requires=[
diff --git a/tests/test_main.py b/tests/test_main.py
index 501a4c7..f88b0f0 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -21,7 +21,7 @@ import os
 import signal
 import tempfile
 import pytest
-from diffoscope.__main__ import main
+from diffoscope.main import main
 
 def test_non_existing_files(capsys):
     args = '/nonexisting1 /nonexisting2'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git


More information about the diffoscope mailing list