[Python-modules-commits] [pyclamd] 01/05: Import pyclamd_0.3.16.orig.tar.gz

[Scott Kitterman]

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

kitterman pushed a commit to branch master
in repository pyclamd.

commit 31fd343120e065438c69270ef762aa618cfd2fb5
Author: Scott Kitterman <scott at kitterman.com>
Date:   Mon Nov 2 09:05:33 2015 -0500

    Import pyclamd_0.3.16.orig.tar.gz
---
 PKG-INFO                  |  4 ++--
 pyClamd.egg-info/PKG-INFO |  4 ++--
 pyclamd/pyclamd.py        | 12 ++++++++++--
 setup.py                  |  3 ++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 54ecab7..11321ed 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,8 +1,8 @@
 Metadata-Version: 1.1
 Name: pyClamd
-Version: 0.3.15
+Version: 0.3.16
 Summary: pyClamd is a python interface to Clamd (Clamav daemon).
-Home-page: http://xael.org/norman/python/pyclamd/
+Home-page: http://xael.org/pages/pyclamd-en.html
 Author: Alexandre Norman
 Author-email: norman()xael.org
 License: License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)
diff --git a/pyClamd.egg-info/PKG-INFO b/pyClamd.egg-info/PKG-INFO
index 54ecab7..11321ed 100644
--- a/pyClamd.egg-info/PKG-INFO
+++ b/pyClamd.egg-info/PKG-INFO
@@ -1,8 +1,8 @@
 Metadata-Version: 1.1
 Name: pyClamd
-Version: 0.3.15
+Version: 0.3.16
 Summary: pyClamd is a python interface to Clamd (Clamav daemon).
-Home-page: http://xael.org/norman/python/pyclamd/
+Home-page: http://xael.org/pages/pyclamd-en.html
 Author: Alexandre Norman
 Author-email: norman()xael.org
 License: License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)
diff --git a/pyclamd/pyclamd.py b/pyclamd/pyclamd.py
index d22fddd..0a9ca9c 100644
--- a/pyclamd/pyclamd.py
+++ b/pyclamd/pyclamd.py
@@ -52,6 +52,7 @@
 # 2014-07-06 v0.3.10 SK/AN: - Bug correction with python3 bytes stream
 # 2015-03-14 v0.3.14 AN : - Bug correction for clamd.conf default path
 # 2015-06-04 v0.3.15 AN : - optimization in scan_stream
+# 2015-10-21 v0.3.16 JMS : - avoid EICAR detection in py3 pyc file
 #------------------------------------------------------------------------------
 # TODO:
 # - improve tests for Win32 platform (avoid to write EICAR file to disk, or
@@ -71,6 +72,7 @@ pyclamd.py
 Author : Alexandre Norman - norman()xael.org
 Contributors :
  - JB :  Joe Brandt  - brandt.joe () gmail.com
+ - JMS: Jack Saunders - jack () oldstlabs.com
  - JS : Joni Salonen - joni.salonen () qindel.com
  - PL :  Philippe Lagadec - philippe.lagadec()laposte.net
  - SK : Scott Kitterman - debian () kitterman.com
@@ -127,7 +129,7 @@ True
 >>> os.remove('/tmp/EICAR-éèô请收藏我们的网址')
 """
 
-__version__ = "0.3.15"
+__version__ = "0.3.16"
 
 
 # $Source$
@@ -173,7 +175,13 @@ class _ClamdGeneric(object):
         """
         # Eicar test string (encoded for skipping virus scanners)
         # Return a str with python2 and bytes with python3
-        EICAR = base64.b64decode('WDVPIVAlQEFQWzRcUFpYNTQoUF4pN0NDKTd9JEVJQ0FSLVNUQU5EQVJELUFOVElWSVJVUy1URVNU\nLUZJTEUhJEgrSCo=\n'.encode('ascii'))
+
+        # B64 without the final newline to avoid clam picking it up in pyc file
+        eicar_b64 = 'WDVPIVAlQEFQWzRcUFpYNTQoUF4pN0NDKTd9JEVJQ0FSLVNUQU5EQVJELUFOVElWSVJVUy1URVNU\nLUZJTEUhJEgrSCo='
+        # Add new line separately
+        eicar_b64 = '%s\n' % eicar_b64
+
+        EICAR = base64.b64decode(eicar_b64.encode('ascii'))
         return EICAR
         
 
diff --git a/setup.py b/setup.py
index abbcca1..5abde91 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,8 @@ setup (name = 'pyClamd',
        author = 'Alexandre Norman',
        author_email = 'norman()xael.org',
        keywords='python, clamav, antivirus, scanner, virus, libclamav',
-       url = 'http://xael.org/norman/python/pyclamd/',
+       url = 'http://xael.org/pages/pyclamd-en.html',
+       bugtrack_url = 'https://bitbucket.org/xael/pyclamd',
        include_dirs = ['/usr/local/include'],
        description = 'pyClamd is a python interface to Clamd (Clamav daemon).',
        long_description = 'pyClamd is a python interface to Clamd (Clamav daemon). By using pyClamd, you can add virus detection capabilities to your python software in an efficient and easy way. Instead of pyClamav which uses libclamav, pyClamd may be used by a closed source product.',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyclamd.git