Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #855 from p-l-/fix-test-pyx 

Rename test_pyx to _test_pyx to "hide" it
This commit is contained in:
Guillaume Valadon 2017-10-02 10:10:50 +02:00 committed by GitHub
parent 40d62678b7 dd4308ebdb
commit 697c462f6d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scapy/consts.py
View File

@ -27,7 +27,7 @@ except (ImportError, RuntimeError):
MATPLOTLIB_DEFAULT_PLOT_KARGS = dict() MATPLOTLIB_DEFAULT_PLOT_KARGS = dict()
log_loading.info("Can't import matplotlib. Won't be able to plot.") log_loading.info("Can't import matplotlib. Won't be able to plot.")
def test_pyx(): def _test_pyx():
"""Returns if PyX is correctly installed or not""" """Returns if PyX is correctly installed or not"""
try: try:
with open(os.devnull, 'wb') as devnull: with open(os.devnull, 'wb') as devnull:
@ -39,7 +39,7 @@ def test_pyx():
try: try:
import pyx import pyx
if test_pyx(): if _test_pyx():
PYX = 1 PYX = 1
else: else:
log_loading.warning("PyX dependencies are not installed ! Please install TexLive or MikTeX.") log_loading.warning("PyX dependencies are not installed ! Please install TexLive or MikTeX.")

8
test/regression.uts
View File

@ -9148,8 +9148,8 @@ test_afterglow()
= psdump() = psdump()
print(test_pyx()) print("PYX: %d" % PYX)
if test_pyx(): if PYX:
import tempfile import tempfile
import os import os
filename = tempfile.mktemp(suffix=".ps") filename = tempfile.mktemp(suffix=".ps")
@ -9160,8 +9160,8 @@ if test_pyx():
= pdfdump() = pdfdump()
print(test_pyx()) print("PYX: %d" % PYX)
if test_pyx(): if PYX:
import tempfile import tempfile
import os import os
filename = tempfile.mktemp(suffix=".pdf") filename = tempfile.mktemp(suffix=".pdf")