[Python-modules-commits] r32010 - in packages/pyclamd/trunk/debian (3 files)

[wrar at users.alioth.debian.org]

    Date: Thursday, March 12, 2015 @ 18:48:50
  Author: wrar
Revision: 32010

Fix import on Python 3 (Closes: #780337)

Added:
  packages/pyclamd/trunk/debian/patches/fix-python3-import.patch
Modified:
  packages/pyclamd/trunk/debian/changelog
  packages/pyclamd/trunk/debian/patches/series

Modified: packages/pyclamd/trunk/debian/changelog
===================================================================
--- packages/pyclamd/trunk/debian/changelog	2015-03-12 12:01:22 UTC (rev 32009)
+++ packages/pyclamd/trunk/debian/changelog	2015-03-12 18:48:50 UTC (rev 32010)
@@ -1,3 +1,10 @@
+pyclamd (0.3.9-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix import on Python 3 (Closes: #780337)
+
+ -- Andrey Rahmatullin <wrar at debian.org>  Thu, 12 Mar 2015 23:47:33 +0500
+
 pyclamd (0.3.9-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/pyclamd/trunk/debian/patches/fix-python3-import.patch
===================================================================
--- packages/pyclamd/trunk/debian/patches/fix-python3-import.patch	                        (rev 0)
+++ packages/pyclamd/trunk/debian/patches/fix-python3-import.patch	2015-03-12 18:48:50 UTC (rev 32010)
@@ -0,0 +1,16 @@
+diff -u pyclamd-0.3.9.orig/__init__.py pyclamd-0.3.9/__init__.py
+--- pyclamd-0.3.9.orig/__init__.py	2012-11-24 00:52:09.000000000 +0600
++++ pyclamd-0.3.9/__init__.py	2015-03-12 23:43:24.344370092 +0500
+@@ -1,5 +1,10 @@
+ #!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ 
+-from pyclamd import __version__
+-from pyclamd import *
++import sys
++if sys.version_info[0] <= 2:
++    from pyclamd import __version__
++    from pyclamd import *
++elif sys.version_info[0] >= 3:
++    from .pyclamd import __version__
++    from .pyclamd import *

Modified: packages/pyclamd/trunk/debian/patches/series
===================================================================
--- packages/pyclamd/trunk/debian/patches/series	2015-03-12 12:01:22 UTC (rev 32009)
+++ packages/pyclamd/trunk/debian/patches/series	2015-03-12 18:48:50 UTC (rev 32010)
@@ -1 +1,2 @@
 examples-print-fix.patch
+fix-python3-import.patch