Merge lp:~jderose/microfiber/python3 into lp:microfiber

[Jason Gerard DeRose]

Okay, Python2 support dropped.

I didn't realize this, but unlike 2to3, 3to2 isn't included with Python itself, isn't packaged in Debian/Ubuntu. So that's a no-go in my book. Microfiber 11.09 is a perfectly good release with Python2 support that we can use to cover our limited remaining Python2 needs.

Viva la Python3!

:^)

[David Jordan (dmj726)]

Okay, seems like a good plan not to keep supporting a python2 version of Microfiber. Since DC3 doesn't need much of Microfiber, I'd say the bast option is to deprecate python2 for Microfiber and put what functionality is needed directly in DC3 rather than require a basically unmaintained package until the PyGI DBus issues are sorted out. Approved.

review: Approve

[Jason Gerard DeRose (jderose)]

As always, thanks for the review, David! :^)

=== modified file 'debian/control'
--- debian/control	2011-09-02 08:22:33 +0000
+++ debian/control	2011-09-30 06:51:26 +0000
@@ -2,9 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Jason Gerard DeRose <[e-mail]>
-Build-Depends: debhelper (>= 8.1), python3 (>= 3.2), python (>= 2.7), python-sphinx
-Standards-Version: 3.9.1
-X-Python-Version: 2.7
+Build-Depends: debhelper (>= 8.9), python3 (>= 3.2), python-sphinx
+Standards-Version: 3.9.2
+X-Python-Version: 3.2
 X-Python3-Version: 3.2
 Homepage: https://launchpad.net/microfiber
 
@@ -19,17 +19,6 @@
  very simple and basically maintenance free as it requires no changes to support
  new additions to the CouchDB API.
 
-Package: python-microfiber
-Architecture: all
-Depends: ${misc:Depends}, python (>= 2.7)
-Description: fabric for a lightweight Couch
- microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
- loving REST API like CouchDB.  Rather than wrapping the API in a bunch of
- one-off methods, microfiber just makes it super easy to call any part of the
- CouchDB REST API, current or future.  This approach allows microfiber to be
- very simple and basically maintenance free as it requires no changes to support
- new additions to the CouchDB API.
-
 Package: python3-microfiber-doc
 Architecture: all
 Section: doc

=== removed file 'debian/python-microfiber.install'
=== modified file 'debian/rules'
--- debian/rules	2011-08-24 05:53:20 +0000
+++ debian/rules	2011-09-30 06:51:26 +0000
@@ -3,11 +3,10 @@
 PYTHON3=$(shell py3versions -vr)
 
 %:
-	dh $@ --with=python3 --with=python2
+	dh $@ --with=python3
 
 test-python%:
 	python$* setup.py test -vv
-	python2.7 setup.py test -vv
 
 override_dh_auto_install:
 	for pyvers in $(shell py3versions -vr); do \
@@ -15,10 +14,5 @@
 				--install-layout=deb \
 				--root $(CURDIR)/debian/python3-microfiber; \
 	done
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py install \
-				--install-layout=deb \
-				--root $(CURDIR)/debian/python-microfiber; \
-	done
 
 override_dh_auto_test: $(PYTHON3:%=test-python%)

=== modified file 'microfiber.py'
--- microfiber.py	2011-09-30 02:15:11 +0000
+++ microfiber.py	2011-09-30 06:51:26 +0000
@@ -22,84 +22,22 @@
 """
 `microfiber` - fabric for a lightweight Couch.
 
-microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
+Microfiber is an generic adapter for making HTTP requests to an arbitrary JSON
 loving REST API like CouchDB.  Rather than wrapping the API in a bunch of
-one-off methods, microfiber just makes it super easy to call any part of the
-CouchDB REST API, current or future.  This approach allows microfiber to be very
+one-off methods, Microfiber just makes it super easy to call any part of the
+CouchDB REST API, current or future.  This approach allows Microfiber to be very
 simple and basically maintenance free as it requires no changes to support new
 additions to the CouchDB API.
 
-For example, with python-couchdb you compact the database like this:
-
->>> database.compact()  #doctest: +SKIP
-
-
-With microfiber, you can accomplish the same thing one of two ways:
-
->>> database.post(None, '_compact')  #doctest: +SKIP
->>> server.post(None, 'mydb', '_compact')  #doctest: +SKIP
-
-
-Depending on your situation, python-couchdb may still be a better fit, so to
-each their own.  If you're new to CouchDB, you will probably find it much easier
-to get started with python-couchdb.  Likewise, if you're coming from the SQL
-world and like an ORM-style API, you will probably feel more at home with
-python-couchdb.
-
-However, if you know the CouchDB REST API or want to learn it, you will find
-microfiber a more harmonious experience.  Also, microfiber is *very* lightweight
-(1 Python file), fast, and memory efficient.  Unlike python-couchdb, microfiber
-doesn't use any wrappers around the results returned from CouchDB, so it's less
-prone to high memory usage and memory fragmentation problems in, say, a long
-running server process.
-
-Long story short, the microfiber API is the CouchDB REST API, and nothing more.
-For example:
-
->>> from microfiber import Server
->>> s = Server()
->>> s
-Server('http://localhost:5984/')
-
-
-Create a database:
-
->>> s.put(None, 'mydb')  #doctest: +SKIP
-{'ok': True}
-
-
-Create a doc:
-
->>> s.post({'_id': 'foo'}, 'mydb')  #doctest: +SKIP
-{'rev': '1-967a00dff5e02add41819138abb3284d', 'ok': True, 'id': 'foo'}
-
-
-Also create a doc:
-
->>> s.put({}, 'mydb', 'bar')  #doctest: +SKIP
-{'rev': '1-967a00dff5e02add41819138abb3284d', 'ok': True, 'id': 'bar'}
-
-
-Upload attachment:
-
->>> s.put_att('image/png', b'da picture', 'mydb', 'baz', 'pic')  #doctest: +SKIP
-{'rev': '1-7c17d20f43962e360062659b4bcd8aea', 'ok': True, 'id': 'baz'}
-
-
-For CouchDB API documentation, see:
-
-    http://techzone.couchbase.com/sites/default/files/uploads/all/documentation/couchbase-api.html
-
-For python-couchdb documentation, see:
-
-    http://packages.python.org/CouchDB/
+Documentation:
+
+    http://docs.novacut.com/microfiber/index.html
+
+Launchpad project:
+
+    https://launchpad.net/microfiber
 """
 
-# FIXME: There is some rather hacky crap in here to support both Python2 and
-# Python3... but once we migrate dmedia to Python3, we'll drop Python2 support
-# in microfiber and clean this up a bit.
-
-import sys
 from os import urandom
 import io
 from base64 import b32encode, b64encode
@@ -107,16 +45,8 @@
 import time
 from hashlib import sha1
 import hmac
-import subprocess
-if sys.version_info >= (3, 0):
-    from urllib.parse import urlparse, urlencode, quote_plus
-    from http.client import HTTPConnection, HTTPSConnection, BadStatusLine
-    strtype = str
-else:
-    from urlparse import urlparse
-    from urllib import urlencode, quote_plus
-    from httplib import HTTPConnection, HTTPSConnection, BadStatusLine
-    strtype = basestring
+from urllib.parse import urlparse, urlencode, quote_plus
+from http.client import HTTPConnection, HTTPSConnection, BadStatusLine
 
 
 __all__ = (
@@ -182,32 +112,18 @@
     ])
 
 
-if sys.version_info >= (3, 0):
-    def dc3_env():
-        env_s = subprocess.check_output(DC3_CMD)
-        return loads(env_s.decode('utf-8'))
-else:
-    def dc3_env():
-        env_s = subprocess.check_output(DC3_CMD)
-        env = loads(env_s)
-        env['url'] = env['url'].encode('utf-8')
-        return env
-
-
-if sys.version_info >= (3, 0):
-    def _json_body(obj):
-        if obj is None:
-            return None
-        if isinstance(obj, (bytes, io.BufferedReader, io.BytesIO)):
-            return obj
-        return dumps(obj, sort_keys=True, separators=(',',':')).encode('utf-8')
-else:
-    def _json_body(obj):
-        if obj is None:
-            return None
-        if isinstance(obj, (file, io.BytesIO)):
-            return obj
-        return dumps(obj, sort_keys=True, separators=(',',':')).encode('utf-8')
+def dc3_env():
+    import subprocess
+    env_s = subprocess.check_output(DC3_CMD)
+    return loads(env_s.decode('utf-8'))
+
+
+def _json_body(obj):
+    if obj is None:
+        return None
+    if isinstance(obj, (bytes, io.BufferedReader, io.BytesIO)):
+        return obj
+    return dumps(obj, sort_keys=True, separators=(',',':')).encode('utf-8')
 
 
 def _queryiter(options):
@@ -219,7 +135,7 @@
     """
     for key in sorted(options):
         value = options[key]
-        if key in ('key', 'startkey', 'endkey') or not isinstance(value, strtype):
+        if key in ('key', 'startkey', 'endkey') or not isinstance(value, str):
             value = dumps(value)
         yield (key, value)
 
@@ -234,9 +150,7 @@
         oauth[k] for k in ('consumer_secret', 'token_secret')
     ).encode('utf-8')
     h = hmac.new(key, base_string.encode('utf-8'), sha1)
-    if sys.version_info >= (3, 0):
-        return b64encode(h.digest()).decode('utf-8')
-    return b64encode(h.digest())
+    return b64encode(h.digest()).decode('utf-8')
 
 
 def _oauth_header(oauth, method, baseurl, query, testing=None):
@@ -279,7 +193,7 @@
         self.data = data
         self.method = method
         self.url = url
-        super(HTTPError, self).__init__()
+        super().__init__()
 
     def __str__(self):
         return '{} {}: {} {}'.format(
@@ -638,7 +552,7 @@
     """
 
     def __init__(self, env=SERVER):
-        super(Server, self).__init__(env)
+        super().__init__(env)
 
     def __repr__(self):
         return '{}({!r})'.format(self.__class__.__name__, self.url)
@@ -679,7 +593,7 @@
         * `Datebase.view(design, view, **options)` - shortcut method, that's all
     """
     def __init__(self, name, env=SERVER):
-        super(Database, self).__init__(env)
+        super().__init__(env)
         self.name = name
         self.basepath += (name + '/')
 

=== modified file 'setup.py'
--- setup.py	2011-09-30 02:15:11 +0000
+++ setup.py	2011-09-30 06:51:26 +0000
@@ -25,7 +25,6 @@
 Install `microfiber`.
 """
 
-import sys
 from distutils.core import setup
 from distutils.cmd import Command
 from distutils.command.build import build
@@ -34,10 +33,7 @@
 import os
 from os import path
 import subprocess
-if sys.version_info >= (3, 0):
-    from urllib.parse import urlparse
-else:
-    from urlparse import urlparse
+from urllib.parse import urlparse
 
 import microfiber
 
@@ -111,7 +107,7 @@
         return None
 
     def run(self):
-        build.run(self)
+        super().run()
         sphinx = self.find_sphinx_path() 
         if sphinx is None:
             print("WARNING: Documentation not generated. python-sphinx missing")

=== modified file 'test_microfiber.py'
--- test_microfiber.py	2011-09-12 22:08:16 +0000
+++ test_microfiber.py	2011-09-30 06:51:26 +0000
@@ -23,11 +23,6 @@
 Unit tests for `microfiber` module.
 """
 
-# FIXME: There is some rather hacky crap in here to support both Python2 and
-# Python3... but once we migrate dmedia to Python3, we'll drop Python2 support
-# in microfiber and clean this up a bit.
-
-import sys
 from unittest import TestCase
 import os
 from os import path
@@ -40,16 +35,13 @@
 import tempfile
 import shutil
 from hashlib import md5
-if sys.version_info >= (3, 0):
-    from urllib.parse import urlparse, urlencode
-    from http.client import HTTPConnection, HTTPSConnection
-else:
-    from urlparse import urlparse
-    from httplib import HTTPConnection, HTTPSConnection
+from urllib.parse import urlparse, urlencode
+from http.client import HTTPConnection, HTTPSConnection
 
 import microfiber
 from microfiber import NotFound, MethodNotAllowed, Conflict, PreconditionFailed
 
+
 # OAuth test string from http://oauth.net/core/1.0a/#anchor46
 BASE_STRING = 'GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal'
 
@@ -68,10 +60,7 @@
 
     def test_random_id(self):
         _id = microfiber.random_id()
-        if sys.version_info >= (3, 0):
-            self.assertIsInstance(_id, str)
-        else:
-            self.assertIsInstance(_id, unicode)
+        self.assertIsInstance(_id, str)
         self.assertEqual(len(_id), 24)
         b = b32decode(_id.encode('ascii'))
         self.assertIsInstance(b, bytes)
@@ -79,10 +68,7 @@
 
     def test_random_id2(self):
         _id = microfiber.random_id2()
-        if sys.version_info >= (3, 0):
-            self.assertIsInstance(_id, str)
-        else:
-            self.assertIsInstance(_id, unicode)
+        self.assertIsInstance(_id, str)
         self.assertEqual(len(_id), 27)
         (t, r) = _id.split('.')
         self.assertEqual(len(t), 10)
@@ -139,10 +125,7 @@
             self.assertIs(microfiber._json_body(fp), fp)
         finally:
             shutil.rmtree(d)
-            
-        # FIXME: There is no way to do this correctly in Python2
-        if sys.version_info < (3, 0):
-            return
+
         # Test when obj is pre-encoded bytes
         self.assertEqual(microfiber._json_body(json_bytes), json_bytes)