Support of Cython 3.1+ and Python 3.12+

.gitignore

@@ -226,7 +226,7 @@ cpyamf/codec.pyd
 cpyamf/util.pyd
 dist
 file_model
-pyamf/_version.py
+src/pyamf/_version.py
 # coverage
 .coverage
 .noseids

.travis.yml

@@ -1,9 +1,8 @@
 language: python
 python:
-  - "3.5"
-  - "3.6"
-  - "3.7"
-  - "3.8"
+  - "3.12"
+  - "3.13"
+  - "3.14"
 sudo: false
 
 cache:
@@ -44,14 +43,13 @@ matrix:
     #   env: GAESDK_VERSION=1.9.30
 
 install:
-   - pip install -r requirements.txt
    - pip install coverage coveralls
-   - pip install -e .
+   - pip install -e .[test]
    - ./install_optional_dependencies.sh
    - ./maybe_install_cython.sh
 
 script:
-  - coverage run --source=pyamf setup.py test
+  - coverage run --source=pyamf pytest ./pyamf
 
 after_success:
   - coveralls

MANIFEST.in

@@ -8,4 +8,4 @@ include *.md
 global-exclude *.swf
 global-exclude *.pyc
 include cpyamf/*.pyx
-include cpyamf/*.pxd
+include cpyamf/*.pxd

README.md

@@ -18,42 +18,57 @@ If you want to make it fast, please send PR.
 This was tested on Ubuntu 16.04.2 and macOS 10.12.4
 
 To install, you can use pip3 on your environment. 
+
 ```
-pip3 install Py3AMF
+pip install py3amf
 ```
 
 Or, you can use setup.py to develop.
 ```
 git clone git@github.com:StdCarrot/Py3AMF.git
 cd Py3AMF
-# python3 setup.py test
-python3 setup.py install
+# pip install -e .[test] && pytest ./pyamf
+pip install -e .
+```
+
+The binary extension is compiled by default. To disable it, use the `PYAMF_DISABLE_EXT` env
+variable.
+
+```shell
+PYAMF_DISABLE_EXT=1 pip install py3amf
+# or
+PYAMF_DISABLE_EXT=1 pip install -e .
 ```
 
 ### Simple example
 Everything is same with PyAMF, but you have to concern str and bytes types.
+
 ```python
 import pyamf
-from pyamf import remoting
+from src.pyamf import remoting
 from pyamf.flex import messaging
 import uuid
 import requests
 
-msg = messaging.RemotingMessage(operation='retrieveUser', 
-                                destination='so.stdc.flexact.common.User',
-                                messageId=str(uuid.uuid4()).upper(),
-                                body=['user_id'])
+msg = messaging.RemotingMessage(
+    operation='retrieveUser',
+    destination='so.stdc.flexact.common.User',
+    messageId=str(uuid.uuid4()).upper(),
+    body=['user_id']
+)
 req = remoting.Request(target='UserService', body=[msg])
-ev = remoting.Envelope(pyamf.AMF3)        
+ev = remoting.Envelope(pyamf.AMF3)
 ev['/0'] = req
 
 # Encode request 
 bin_msg = remoting.encode(ev)
 
 # Send request; You can use other channels like RTMP
-resp = requests.post('http://example.com/amf', 
-                     data=bin_msg.getvalue(), 
-                     headers={'Content-Type': 'application/x-amf'})
+resp = requests.post(
+    'http://example.com/amf',
+    data=bin_msg.getvalue(),
+    headers={'Content-Type': 'application/x-amf'}
+)
 
 # Decode response
 resp_msg = remoting.decode(resp.content)

README.rst

@@ -33,16 +33,25 @@ To install, you can use pip3 on your environment.
 
 ::
 
-   pip3 install Py3AMF
+   pip3 install py3amf
 
 Or, you can use setup.py to develop.
 
 ::
 
    git clone git@github.com:StdCarrot/Py3AMF.git
    cd Py3AMF
-   # python3 setup.py test
-   python3 setup.py install
+   # pip install -e .[test] && pytest ./pyamf
+   pip install -e .
+
+The binary extension is compiled by default. To disable it, use the `PYAMF_DISABLE_EXT` env
+variable.
+
+::
+
+    PYAMF_DISABLE_EXT=1 pip install py3amf
+    # or
+    PYAMF_DISABLE_EXT=1 pip install -e .
 
 Simple example
 ~~~~~~~~~~~~~~

doc/tutorials/examples/apache/mod_python.py

@@ -1,4 +1,4 @@
-from pyamf.remoting.gateway.wsgi import WSGIGateway
+from src.pyamf.remoting import WSGIGateway
 
 import logging
 

doc/tutorials/examples/apache/mod_wsgi.py

@@ -1,4 +1,4 @@
-from pyamf.remoting.gateway.wsgi import WSGIGateway
+from src.pyamf.remoting import WSGIGateway
 
 def echo(data):
    return data

doc/tutorials/examples/gateways/appengine/client.py

@@ -1,8 +1,8 @@
 import logging
 
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
+
 
-
 logging.basicConfig(
     level=logging.DEBUG,
     format='%(asctime)s %(levelname)-5.5s [%(name)s] %(message)s'

doc/tutorials/examples/gateways/cherrypy/client.py

@@ -1,8 +1,8 @@
 import logging
 
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
+
 
-
 logging.basicConfig(
     level=logging.DEBUG,
     format='%(asctime)s %(levelname)-5.5s [%(name)s] %(message)s'
@@ -13,4 +13,4 @@
 gw = RemotingService(path, logger=logging)
 service = gw.getService('myservice')
 
-print service.echo('Hello World!')
+print service.echo('Hello World!')

doc/tutorials/examples/gateways/turbogears/mygateway.py

@@ -1,6 +1,6 @@
 import logging
 
-from pyamf.remoting.gateway.wsgi import WSGIGateway
+from src.pyamf.remoting import WSGIGateway
 
 
 logging.basicConfig(
@@ -27,4 +27,4 @@ def scramble(self, text):
 # Expose our services
 services = {"Services" : Services()}
 
-GatewayController = WSGIGateway(services, logger=logging, debug=True)
+GatewayController = WSGIGateway(services, logger=logging, debug=True)

doc/tutorials/examples/gateways/twisted/client.py

@@ -1,7 +1,7 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 import logging
-        
+
 logging.basicConfig(
     level=logging.DEBUG,
     format='%(asctime)s %(levelname)-5.5s [%(name)s] %(message)s'
@@ -15,4 +15,4 @@
 print service1.testn('Hello World')
 
 service2 = client.getService('myadd')
-print service2(1,2)
+print service2(1,2)

doc/tutorials/examples/gateways/twisted/wsgi.py

@@ -1,6 +1,6 @@
 import logging
 
-from pyamf.remoting.gateway.wsgi import WSGIGateway
+from src.pyamf.remoting import WSGIGateway
 from pyamf.remoting.gateway import expose_request
 
 from twisted.web import server
@@ -9,7 +9,7 @@
 from twisted.internet import reactor
 from twisted.application import service, strports
 
-        
+
 logging.basicConfig(
     level=logging.DEBUG,
     format='%(asctime)s %(levelname)-5.5s [%(name)s] %(message)s'
@@ -35,15 +35,15 @@ def testn(self, request, n):
 
 
 # A standalone function that can be bound to a service.
-def add(a, b): 
-    return a + b 
+def add(a, b):
+    return a + b
 
 
 # Create a dictionary mapping the service namespaces to a function
 # or class instance
-services = { 
+services = {
     'example': example(),
-    'myadd': add 
+    'myadd': add
 }
 
 # Create and start a thread pool,
@@ -64,4 +64,4 @@ def add(a, b):
 
 # Hooks for twistd
 application = service.Application('PyAMF Sample Remoting Server')
-server.setServiceParent(application)
+server.setServiceParent(application)

doc/tutorials/examples/gateways/werkzeug/client.py

@@ -1,7 +1,7 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 import logging
-        
+
 logging.basicConfig(
     level=logging.DEBUG,
     format='%(asctime)s %(levelname)-5.5s [%(name)s] %(message)s'
@@ -12,4 +12,4 @@
 service = client.getService('echo')
 echo = service('Hello World!')
 
-logging.debug(echo)
+logging.debug(echo)

doc/tutorials/examples/general/client/authentication.py

@@ -1,4 +1,4 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 client = RemotingService('https://demo.pyamf.org/gateway/authentication')
 client.setCredentials('jane', 'doe')
@@ -7,4 +7,4 @@
 print service.sum(85, 115) # should print 200.0
 
 client.setCredentials('abc', 'def')
-print service.sum(85, 115).description # should print Authentication Failed
+print service.sum(85, 115).description # should print Authentication Failed

doc/tutorials/examples/general/client/basic.py

@@ -1,6 +1,6 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 client = RemotingService('http://demo.pyamf.org/gateway/recordset')
 service = client.getService('service')
 
-print service.getLanguages()
+print service.getLanguages()

doc/tutorials/examples/general/client/exception.py

@@ -1,4 +1,4 @@
->>> from pyamf.remoting.client import RemotingService
+>>> from src.pyamf.remoting import RemotingService
 >>> gateway = RemotingService('http://example.org/gw')
 >>> service = gateway.getService('type_error')
 >>> service()

doc/tutorials/examples/general/client/headers.py

@@ -1,4 +1,4 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 gw = RemotingService('http://demo.pyamf.org/gateway/recordset')
 

doc/tutorials/examples/general/client/logger.py

@@ -1,4 +1,4 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 import logging
 logging.basicConfig(level=logging.DEBUG,
@@ -8,4 +8,4 @@
 client = RemotingService(gateway, logger=logging)
 service = client.getService('service')
 
-print service.getLanguages()
+print service.getLanguages()

doc/tutorials/examples/general/client/referer.py

@@ -1,4 +1,4 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 appReferer = 'client.py'
 gateway = 'http://demo.pyamf.org/gateway/helloworld'

doc/tutorials/examples/general/client/user_agent.py

@@ -1,4 +1,4 @@
-from pyamf.remoting.client import RemotingService
+from src.pyamf.remoting import RemotingService
 
 appName = 'MyApp/0.1.0'
 gateway = 'http://demo.pyamf.org/gateway/helloworld'