Fix installation via pip

bgaifullin · bgaifullin · commit 15e6ce62658c · 2017-08-15T17:02:35.000+03:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,5 @@ include src/*
 include requirements*.txt
 include LICENSE
 include version.txt
-include setupinfo.py
-include extra.py
+include xmlsec_setupinfo.py
+include xmlsec_extra.py
diff --git a/xmlsec_extra.py b/xmlsec_extra.py
diff --git a/xmlsec_setupinfo.py b/xmlsec_setupinfo.py
@@ -117,7 +117,7 @@ def load_xmlsec1_config():
     config = None
 
     if WIN32:
-        import extra
+        import xmlsec_extra
 
         config = {
             'define_macros': [
@@ -154,7 +154,7 @@ def load_xmlsec1_config():
             'library_dirs': [],
             }
 
-        extra.get_prebuilt_libs(
+        xmlsec_extra.get_prebuilt_libs(
             OPTION_DOWNLOAD_DIR, config['include_dirs'], config['library_dirs']
         )
     else:

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ def load_xmlsec1_config():`
`117`	`117`	`config = None`
`118`	`118`
`119`	`119`	`if WIN32:`
`120`		`- import extra`
	`120`	`+ import xmlsec_extra`
`121`	`121`
`122`	`122`	`config = {`
`123`	`123`	`'define_macros': [`
`@@ -154,7 +154,7 @@ def load_xmlsec1_config():`
`154`	`154`	`'library_dirs': [],`
`155`	`155`	`}`
`156`	`156`
`157`		`- extra.get_prebuilt_libs(`
	`157`	`+ xmlsec_extra.get_prebuilt_libs(`
`158`	`158`	`OPTION_DOWNLOAD_DIR, config['include_dirs'], config['library_dirs']`
`159`	`159`	`)`
`160`	`160`	`else:`