summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PKG-INFO.in2
-rw-r--r--README3
-rw-r--r--configure.ac3
-rw-r--r--examples/gio/directory-async.py33
-rw-r--r--examples/gio/downloader.py77
-rw-r--r--pygobject.doap2
6 files changed, 3 insertions, 117 deletions
diff --git a/PKG-INFO.in b/PKG-INFO.in
index ac0e2e66..5cffe139 100644
--- a/PKG-INFO.in
+++ b/PKG-INFO.in
@@ -9,7 +9,7 @@ Maintainer: Johan Dahlin
Maintainer-email: johan@gnome.org
License: GNU LGPL
Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/@PYGOBJECT_MAJOR_VERSION@.@PYGOBJECT_MINOR_VERSION@/pygobject-@VERSION@.tar.gz
-Description: Python bindings for GLib, GObject and GIO
+Description: Python bindings for GLib and GObject
Platform: POSIX, Windows
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Linux
diff --git a/README b/README
index c5a70896..24dae6cf 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ Current maintainers: Gustavo J A M Carneiro <gjc@gnome.org>
Gian Mario Tagliaretti <gianmt@gnome.org>
Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
-This archive contains bindings for the GLib, GObject and GIO,
+This archive contains bindings for the GLib, and GObject,
to be used in Python. It is a fairly complete set of bindings,
it's already rather useful, and is usable to write moderately
complex programs. (see the examples directory for some examples
@@ -45,7 +45,6 @@ Requirements
* Python 2.3.5 or higher
* Glib 2.22.4 or higher
* GIO 2.22.4 or higher
- * GIO-unix 2.22.4 or higher
* libffi (optional)
Copyright Information
diff --git a/configure.ac b/configure.ac
index dd68678e..12605369 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,6 @@ m4_define(introspection_required_version, 0.10.2)
m4_define(pycairo_required_version, 1.2.0)
m4_define(glib_required_version, 2.24.0)
m4_define(gio_required_version, 2.24.0)
-m4_define(giounix_required_version, 2.22.4)
AC_INIT(pygobject, pygobject_version,
[http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject])
@@ -202,8 +201,6 @@ AC_SUBST(LIBFFI_PC)
dnl gio
PKG_CHECK_MODULES(GIO, gio-2.0 >= gio_required_version)
-AC_SUBST(GIO_CFLAGS)
-AC_SUBST(GIO_LIBS)
AC_ARG_ENABLE(cairo,
AC_HELP_STRING([--enable-cairo], [Enable Cairo bindings using introspection information]),
diff --git a/examples/gio/directory-async.py b/examples/gio/directory-async.py
deleted file mode 100644
index 273e3845..00000000
--- a/examples/gio/directory-async.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Async Directory listing
-# Johan Dahlin 2008
-
-import sys
-
-import glib
-import gio
-
-def next_files_done(enumerator, result):
- for file_info in enumerator.next_files_finish(result):
- print file_info.get_name()
- loop.quit()
-
-def enumerate_children_done(gfile, result):
- try:
- enumerator = gfile.enumerate_children_finish(result)
- except gio.Error, e:
- print 'ERROR:', e
- loop.quit()
- return
- enumerator.next_files_async(100, next_files_done)
-
-if len(sys.argv) >= 2:
- uri = sys.argv[1]
-else:
- uri = "/"
-
-gfile = gio.File(uri)
-gfile.enumerate_children_async(
- "standard::name", enumerate_children_done)
-
-loop = glib.MainLoop()
-loop.run()
diff --git a/examples/gio/downloader.py b/examples/gio/downloader.py
deleted file mode 100644
index 0c34f542..00000000
--- a/examples/gio/downloader.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# Example GIO based Asynchronous downloader
-# Johan Dahlin 2008
-
-import sys
-
-import glib
-import gio
-
-
-class Downloader(object):
- def __init__(self, uri):
- self.fetched = 0
- self.total = -1
- self.uri = uri
- self.loop = None
- self.gfile = gio.File(self.uri)
- self.output = self.get_output_filename()
- self.fd = None
-
- def get_output_filename(self):
- basename = self.gfile.get_basename()
- if basename == '/':
- basename = 'index.html'
- return basename
-
- def stream_read_callback(self, stream, result):
- data = stream.read_finish(result)
- if not data:
- self.data_finished()
- return
- self.data_read(data)
- stream.read_async(4096, self.stream_read_callback)
-
- def read_callback(self, gfile, result):
- try:
- stream = gfile.read_finish(result)
- except gio.Error, e:
- print 'ERROR: %s' % (e.message,)
- self.stop()
- return
- info = gfile.query_info(gio.FILE_ATTRIBUTE_STANDARD_SIZE)
- self.total = info.get_attribute_uint64(gio.FILE_ATTRIBUTE_STANDARD_SIZE)
- stream.read_async(4096, self.stream_read_callback)
-
- def data_read(self, data):
- if self.fd is None:
- self.fd = open(self.output, 'w')
- self.fd.write(data)
- self.fetched += len(data)
- if self.total != -1:
- print '%7.2f %%' % (self.fetched / float(self.total) * 100)
-
- def data_finished(self):
- print '%d bytes read.' % (self.fetched,)
- self.fd.close()
- self.stop()
-
- def start(self):
- print 'Downloading %s -> %s' % (self.uri, self.output)
- self.gfile.read_async(self.read_callback)
- self.loop = glib.MainLoop()
- self.loop.run()
-
- def stop(self):
- self.loop.quit()
-
-
-def main(args):
- if len(args) < 2:
- print 'Needs a URI'
- return 1
-
- d = Downloader(args[1])
- d.start()
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv))
diff --git a/pygobject.doap b/pygobject.doap
index 61832e9b..3ae8fd50 100644
--- a/pygobject.doap
+++ b/pygobject.doap
@@ -5,7 +5,7 @@
xmlns="http://usefulinc.com/ns/doap#">
<name xml:lang="en">PyGObject</name>
- <shortdesc xml:lang="en">Python bindings GLib, GObject and GIO</shortdesc>
+ <shortdesc xml:lang="en">Python bindings GLib and GObject</shortdesc>
<homepage rdf:resource="http://live.gnome.org/PyGObject" />
<mailing-list rdf:resource="http://www.daa.com.au/mailman/listinfo/pygtk" />
<category rdf:resource="http://api.gnome.org/doap-extensions#bindings" />